commit ece72f3f20ec102c845d5e849a6e154b5131b203
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 09 20:43:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 09 20:43:45 2018 +0000
tree b38dda77798db82df47b5a792cf58ec3ae2d6614
parent 79a7244d103351f798c89a0454e44453a34a271f
parent a3305355f1ee123bf981e9d47c82d6a11b5cb4b5

Merge "InCallActivity should not call onUiShowing(false) when recreating."

java/com/android/incallui/InCallActivity.java

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index f09f0d9..0a56666 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -479,7 +479,9 @@
       dialpadFragment.onDialerKeyUp(null);
     }
 
-    InCallPresenter.getInstance().onUiShowing(false);
+    if (!isRecreating) {
+      InCallPresenter.getInstance().onUiShowing(false);
+    }
     if (isFinishing()) {
       InCallPresenter.getInstance().unsetActivity(this);
     }
@@ -590,7 +592,8 @@
     }
   }
 
-  private void onNewIntent(Intent intent, boolean isRecreating) {
+  @VisibleForTesting
+  void onNewIntent(Intent intent, boolean isRecreating) {
     this.isRecreating = isRecreating;
 
     // We're being re-launched with a new Intent.  Since it's possible for a single InCallActivity