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 | f413d94c10fdff825da887cc6398dc8c08ca489d (patch) | |
tree | afed809e07fd8888eed4e02b74a76863e9f8ddf1 /src | |
parent | 17901f430c3e1a53d1fe94ea6720d85de61280b1 (diff) | |
parent | 29669fa9974ee7189bb89793d4b6fd13b5672fcb (diff) | |
download | packages_apps_InCallUI-f413d94c10fdff825da887cc6398dc8c08ca489d.tar.gz packages_apps_InCallUI-f413d94c10fdff825da887cc6398dc8c08ca489d.tar.bz2 packages_apps_InCallUI-f413d94c10fdff825da887cc6398dc8c08ca489d.zip |
Merge "Call InCallPresenter.setActivity(null) in onPause" into lmp-mr1-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/incallui/InCallActivity.java | 8 | ||||
-rw-r--r-- | src/com/android/incallui/InCallPresenter.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index 8382c163..c410b5ff 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/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/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java index 1299dd32..297ecb80 100644 --- a/src/com/android/incallui/InCallPresenter.java +++ b/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; |