diff options
| author | Andrew Lee <anwlee@google.com> | 2014-12-15 10:42:06 -0800 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-12-15 11:05:30 -0800 |
| commit | ddaed9152c17a83930ba4c8229b48cc1be676157 (patch) | |
| tree | fd24d0b188e4d20045a3fa478d61c002fa1a0808 | |
| parent | 1edf38212b4c29eeb46a81a9b58c8b80628e6d50 (diff) | |
| download | packages_apps_InCallUI-ddaed9152c17a83930ba4c8229b48cc1be676157.tar.gz packages_apps_InCallUI-ddaed9152c17a83930ba4c8229b48cc1be676157.tar.bz2 packages_apps_InCallUI-ddaed9152c17a83930ba4c8229b48cc1be676157.zip | |
Use mInCallActivity if mContext is null.
It seems that attemptFinishActivity can occasionally be invoked when
mContext hasn't been set, via setActivity -> updateActivity ->
attemptFinishActivity, if there are NO_CALLS. In this case, fall back
on mInCallActivity as the context for clearing the display.
Bug: 18728214
Change-Id: I504af612f79e14787741b14b03170805f57c5699
| -rw-r--r-- | src/com/android/incallui/InCallPresenter.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java index 0004d461..5ad31b17 100644 --- a/src/com/android/incallui/InCallPresenter.java +++ b/src/com/android/incallui/InCallPresenter.java @@ -258,7 +258,12 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { private void attemptFinishActivity() { mWaitForRevealAnimationStart = false; - CircularRevealActivity.sendClearDisplayBroadcast(mContext); + + Context context = mContext != null ? mContext : mInCallActivity; + if (context != null) { + CircularRevealActivity.sendClearDisplayBroadcast(context); + } + final boolean doFinish = (mInCallActivity != null && isActivityStarted()); Log.i(this, "Hide in call UI: " + doFinish); if (doFinish) { |