diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-11 08:43:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-11 08:43:20 +0000 |
| commit | bed757cd19dca5dffa2a07af579f65028419c242 (patch) | |
| tree | 6c865335b8872cc084e5a30993d75fcd257c005e /java/com/android/incallui | |
| parent | 50a0f00319c6fe9730d42b1b5f8b90d49b7a140a (diff) | |
| parent | 60dd96aa640ed4619de915576b5ed0df53081fc4 (diff) | |
Merge changes I0115fb26,I7a29bf5a,I7888f3b6,I06d5d3d8,I4c601b16, ...
* changes:
Implemented CompositePhoneLookup#bulkUpdate.
Allow the client to specify voicemail transcript id's
Implement bulk update for Cp2PhoneLookup.
Add character mappings for Bulgarian & Ukrainian in DialpadCharMappings.
Support dual alphabets in smart search when a secondary alphabet is available.
Commit transaction synchronously for OnHoldFragment.
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/incall/impl/InCallFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index fc31c74e2..73b414d46 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -320,7 +320,7 @@ public class InCallFragment extends Fragment } } transaction.setCustomAnimations(R.anim.abc_slide_in_top, R.anim.abc_slide_out_top); - transaction.commitAllowingStateLoss(); + transaction.commitNowAllowingStateLoss(); } @Override |