From 43073477f2f737d02976c593548a1bfa87f7031f Mon Sep 17 00:00:00 2001
From: roldenburg <roldenburg@google.com>
Date: Wed, 15 Nov 2017 12:31:06 -0800
Subject: Automated rollback

END_PUBLIC

BEGIN_PUBLIC
Automated rollback of changelist 169615685

Test: rollback
PiperOrigin-RevId: 175863544
Change-Id: I8785da90afed236cbe897efe774263765f188b14
---
 java/com/android/incallui/InCallActivityCommon.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index e9c2467ef..5e68ce8a6 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -264,9 +264,6 @@ public class InCallActivityCommon {
             == InCallOrientationEventListener.ACTIVITY_PREFERENCE_ALLOW_ROTATION);
 
     InCallPresenter.getInstance().onActivityStarted();
-    if (!isRecreating) {
-      InCallPresenter.getInstance().onUiShowing(true);
-    }
     Trace.endSection();
   }
 
@@ -278,6 +275,7 @@ public class InCallActivityCommon {
           "InCallPresenter is ready for tear down, not sending updates");
     } else {
       updateTaskDescription();
+      InCallPresenter.getInstance().onUiShowing(true);
     }
 
     // If there is a pending request to show or hide the dialpad, handle that now.
@@ -323,6 +321,7 @@ public class InCallActivityCommon {
       dialpadFragment.onDialerKeyUp(null);
     }
 
+    InCallPresenter.getInstance().onUiShowing(false);
     if (inCallActivity.isFinishing()) {
       InCallPresenter.getInstance().unsetActivity(inCallActivity);
     }
@@ -345,7 +344,6 @@ public class InCallActivityCommon {
     InCallPresenter.getInstance().updateIsChangingConfigurations();
     InCallPresenter.getInstance().onActivityStopped();
     if (!isRecreating) {
-      InCallPresenter.getInstance().onUiShowing(false);
       if (errorDialog != null) {
         errorDialog.dismiss();
       }
-- 
cgit v1.2.3