Update Dialer to V10 RC16 am: 10b34a5ebf

am: 300a8683b9

Change-Id: If5695bad59f8a4dab6e6c90b54943b900bd2652a

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);