From 006ac375f0abdbe65fb86373987a7a320e0f3358 Mon Sep 17 00:00:00 2001
From: roldenburg <roldenburg@google.com>
Date: Wed, 15 Nov 2017 10:59:49 -0800
Subject: Automated rollback

END_PUBLIC

BEGIN_PUBLIC
Automated rollback of changelist 169756942

Test: rollback
PiperOrigin-RevId: 175849764
Change-Id: I3be3899682db84521fd933a5f058d5518ecb1fa1
---
 java/com/android/incallui/InCallActivityCommon.java | 7 ++++---
 1 file 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() {
-- 
cgit v1.2.3