diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-09 20:43:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-09 20:43:45 +0000 |
| commit | ece72f3f20ec102c845d5e849a6e154b5131b203 (patch) | |
| tree | b38dda77798db82df47b5a792cf58ec3ae2d6614 | |
| parent | 79a7244d103351f798c89a0454e44453a34a271f (diff) | |
| parent | a3305355f1ee123bf981e9d47c82d6a11b5cb4b5 (diff) | |
Merge "InCallActivity should not call onUiShowing(false) when recreating."
| -rw-r--r-- | java/com/android/incallui/InCallActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index f09f0d944..0a5666690 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -479,7 +479,9 @@ public class InCallActivity extends TransactionSafeFragmentActivity dialpadFragment.onDialerKeyUp(null); } - InCallPresenter.getInstance().onUiShowing(false); + if (!isRecreating) { + InCallPresenter.getInstance().onUiShowing(false); + } if (isFinishing()) { InCallPresenter.getInstance().unsetActivity(this); } @@ -590,7 +592,8 @@ public class InCallActivity extends TransactionSafeFragmentActivity } } - 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 |