commit 345b0e1ec3a435e49b36bfc6d415024a5361157f
author yueg <yueg@google.com> Fri Sep 22 17:01:43 2017 -0700
committer Eric Erfanian <erfanian@google.com> Mon Sep 25 08:51:43 2017 -0700
tree 7a8952d76683873d937467192f1810366cb61a97
parent 1e80bdd0a34901d8ccd3c097e2e39cd357d939d1

Fix crash on ending call.

We moved onUiShowing() call from InCallActivityCommon.onPause to onStop in
cl/169615685, which causes the crash since InCallPresenter is cleared up before
calling onUiShowing() and mContext is null at that time.

This CL fix the crash by also moving the clearup(InCallPresenter.unsetActivity()) from onPause
to onStop. It also makes sense because InCallPresenter.onActivityStarted() is
called in onStart instead of onPause.

Test: manual
PiperOrigin-RevId: 169756942
Change-Id: I222009be1b672f8a6dcb8bfdcea2d633c5810575

java/com/android/incallui/InCallActivityCommon.java

diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index fec9700..9e6271f 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -317,10 +317,6 @@
     if (dialpadFragment != null) {
       dialpadFragment.onDialerKeyUp(null);
     }
-
-    if (inCallActivity.isFinishing()) {
-      InCallPresenter.getInstance().unsetActivity(inCallActivity);
-    }
   }
 
   public void onStop() {
@@ -342,6 +338,9 @@
     if (!isRecreating) {
       InCallPresenter.getInstance().onUiShowing(false);
     }
+    if (inCallActivity.isFinishing()) {
+      InCallPresenter.getInstance().unsetActivity(inCallActivity);
+    }
   }
 
   public void onDestroy() {