diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:23:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:23:13 +0000 |
commit | 300a8683b9c28424fb0f0c571a0abe128c461f69 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/InCallActivityCommon.java | |
parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
parent | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff) |
Update Dialer to V10 RC16
am: 10b34a5ebf
Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/incallui/InCallActivityCommon.java')
-rw-r--r-- | java/com/android/incallui/InCallActivityCommon.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java index 01dc1bb36..e6c74b0a9 100644 --- a/java/com/android/incallui/InCallActivityCommon.java +++ b/java/com/android/incallui/InCallActivityCommon.java @@ -300,7 +300,7 @@ public class InCallActivityCommon { InCallPresenter.getInstance().updateIsChangingConfigurations(); } - public void onNewIntent(Intent intent) { + void onNewIntent(Intent intent, boolean isRecreating) { LogUtil.i("InCallActivityCommon.onNewIntent", ""); // We're being re-launched with a new Intent. Since it's possible for a @@ -317,7 +317,10 @@ public class InCallActivityCommon { // we can count on our onResume() method being called next. // Just like in onCreate(), handle the intent. - internalResolveIntent(intent); + // Skip if InCallActivity is going to recreate since this will be called in onCreate(). + if (!isRecreating) { + internalResolveIntent(intent); + } } public boolean onBackPressed(boolean isInCallScreenVisible) { @@ -414,6 +417,7 @@ public class InCallActivityCommon { break; case KeyEvent.KEYCODE_EQUALS: break; + default: // fall out } return event.getRepeatCount() == 0 && handleDialerKeyDown(keyCode, event); |