diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-31 07:17:50 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2014-10-31 07:17:50 -0700 |
commit | 7aa1720391f35f2b242b6eb82394287be6d6f366 (patch) | |
tree | 5aa42b52307608f2b6dff877a77bdef880de3113 /InCallUI | |
parent | e05642ba64551c6fc96dee79e65d223f9326a749 (diff) |
Call InCallPresenter.setActivity(null) in onPause
Minimize the time InCallPresenter spends on the state where
mInCallActivity is not null but it is also finishing.
Bug: 18150786
Change-Id: Ibf432625180e40c79220bbc1562565033d1e2618
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 27d17c4b5..1d0ca94fc 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; @@ -226,6 +225,10 @@ public class InCallActivity extends Activity { } InCallPresenter.getInstance().onUiShowing(false); + + if (isFinishing()) { + InCallPresenter.getInstance().setActivity(null); + } } @Override @@ -237,9 +240,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; |