diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-31 16:49:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 16:49:03 +0000 |
commit | 6a0b4dd87b24ab805ff82bb1801190495ee78cc9 (patch) | |
tree | 36ce92695a9de6260402371926734632e8001b35 /InCallUI | |
parent | 843a666c3740ce41864ea8249465286316130dfa (diff) | |
parent | 7aa1720391f35f2b242b6eb82394287be6d6f366 (diff) |
Merge "Call InCallPresenter.setActivity(null) in onPause" into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 8 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 2 |
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; |