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/InCallActivity.java | |
parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
parent | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff) |
Update Dialer to V10 RC16
am: 10b34a5ebf
Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/incallui/InCallActivity.java')
-rw-r--r-- | java/com/android/incallui/InCallActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 03e5ab29a..e1e699011 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -242,7 +242,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity @Override protected void onNewIntent(Intent intent) { LogUtil.i("InCallActivity.onNewIntent", ""); - common.onNewIntent(intent); // If the screen is off, we need to make sure it gets turned on for incoming calls. // This normally works just fine thanks to FLAG_TURN_SCREEN_ON but that only works @@ -250,8 +249,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity // for the call waiting case, we recreate() the current activity. There should be no jank from // this since the screen is already off and will remain so until our new activity is up. if (!isVisible()) { + common.onNewIntent(intent, true /* isRecreating */); LogUtil.i("InCallActivity.onNewIntent", "Restarting InCallActivity to force screen on."); recreate(); + } else { + common.onNewIntent(intent, false /* isRecreating */); } } @@ -526,7 +528,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity "shouldShowAnswerUi: %b, shouldShowVideoUi: %b, " + "didShowAnswerScreen: %b, didShowInCallScreen: %b, didShowVideoCallScreen: %b", shouldShowAnswerUi.shouldShow, - shouldShowVideoUi, + shouldShowVideoUi.shouldShow, didShowAnswerScreen, didShowInCallScreen, didShowVideoCallScreen); |