summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/InCallActivityCommon.java
diff options
context:
space:
mode:
authorroldenburg <roldenburg@google.com>2017-11-15 12:31:06 -0800
committerzachh <zachh@google.com>2017-11-18 07:30:08 +0000
commit43073477f2f737d02976c593548a1bfa87f7031f (patch)
tree20374159571fd7e1506a78b415a31690b22611e6 /java/com/android/incallui/InCallActivityCommon.java
parentf99f630265628ce4ff899d0ba74de91fb116ffdd (diff)
Automated rollback
END_PUBLIC BEGIN_PUBLIC Automated rollback of changelist 169615685 Test: rollback PiperOrigin-RevId: 175863544 Change-Id: I8785da90afed236cbe897efe774263765f188b14
Diffstat (limited to 'java/com/android/incallui/InCallActivityCommon.java')
-rw-r--r--java/com/android/incallui/InCallActivityCommon.java6
1 files changed, 2 insertions, 4 deletions
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();
}