commit 006ac375f0abdbe65fb86373987a7a320e0f3358
author roldenburg <roldenburg@google.com> Wed Nov 15 10:59:49 2017 -0800
committer zachh <zachh@google.com> Sat Nov 18 07:29:30 2017 +0000
tree 9e9e19842308897456bd7035cf8202bb95e927f4
parent 9c5d723468ff0046419d286729060221f00f7577

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

diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index e97e6a0..3914e38 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -322,6 +322,10 @@
     if (dialpadFragment != null) {
       dialpadFragment.onDialerKeyUp(null);
     }
+
+    if (inCallActivity.isFinishing()) {
+      InCallPresenter.getInstance().unsetActivity(inCallActivity);
+    }
   }
 
   public void onStop() {
@@ -346,9 +350,6 @@
         dialog.dismiss();
       }
     }
-    if (inCallActivity.isFinishing()) {
-      InCallPresenter.getInstance().unsetActivity(inCallActivity);
-    }
   }
 
   public void onDestroy() {