summaryrefslogtreecommitdiff
path: root/java/com/android/incallui
diff options
context:
space:
mode:
authorroldenburg <roldenburg@google.com>2017-11-15 10:59:49 -0800
committerzachh <zachh@google.com>2017-11-18 07:29:30 +0000
commit006ac375f0abdbe65fb86373987a7a320e0f3358 (patch)
tree9e9e19842308897456bd7035cf8202bb95e927f4 /java/com/android/incallui
parent9c5d723468ff0046419d286729060221f00f7577 (diff)
Automated rollback
END_PUBLIC BEGIN_PUBLIC Automated rollback of changelist 169756942 Test: rollback PiperOrigin-RevId: 175849764 Change-Id: I3be3899682db84521fd933a5f058d5518ecb1fa1
Diffstat (limited to 'java/com/android/incallui')
-rw-r--r--java/com/android/incallui/InCallActivityCommon.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index e97e6a001..3914e386c 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -322,6 +322,10 @@ public class InCallActivityCommon {
if (dialpadFragment != null) {
dialpadFragment.onDialerKeyUp(null);
}
+
+ if (inCallActivity.isFinishing()) {
+ InCallPresenter.getInstance().unsetActivity(inCallActivity);
+ }
}
public void onStop() {
@@ -346,9 +350,6 @@ public class InCallActivityCommon {
dialog.dismiss();
}
}
- if (inCallActivity.isFinishing()) {
- InCallPresenter.getInstance().unsetActivity(inCallActivity);
- }
}
public void onDestroy() {