am 27e7f76f: am f413d94c: Merge "Call InCallPresenter.setActivity(null) in onPause" into lmp-mr1-dev

* commit '27e7f76f138d889c1d08fb5894198fb23a5ac090':
  Call InCallPresenter.setActivity(null) in onPause

2 files changed, 5 insertions, 5 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 8382c1639..c410b5ffc 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -30,7 +30,6 @@ import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
 import android.telecom.DisconnectCause;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
@@ -228,6 +227,10 @@ public class InCallActivity extends Activity {
         }
 
         InCallPresenter.getInstance().onUiShowing(false);
+
+        if (isFinishing()) {
+            InCallPresenter.getInstance().setActivity(null);
+        }
     }
 
     @Override
@@ -239,9 +242,6 @@ public class InCallActivity extends Activity {
     @Override
     protected void onDestroy() {
         Log.d(this, "onDestroy()...  this = " + this);
-
-        InCallPresenter.getInstance().setActivity(null);
-
         super.onDestroy();
     }
 
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 1299dd32d..297ecb807 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -275,7 +275,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
                 return;
             }
         } else {
-            Log.i(this, "UI Destroyed)");
+            Log.i(this, "UI Destroyed");
             updateListeners = true;
             mInCallActivity = null;