diff options
| author | Andrew Lee <anwlee@google.com> | 2014-12-16 19:02:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 19:02:40 +0000 |
| commit | 35a8a6d734225bec4cc586bfb0f44985f316b77b (patch) | |
| tree | 5341fde108154445118671f60bb04b2a437a69bd | |
| parent | 30f9f98b0f23a8861df7f5081154f61ea1ea0441 (diff) | |
| parent | f14a8057bb7e87c163ad6093e03c398cb416a2a0 (diff) | |
am 4383e5db: Merge "Use mInCallActivity if mContext is null." into lmp-mr1-dev
* commit '4383e5db52f0c5b6cb117141114e7394e3d68a2c':
Use mInCallActivity if mContext is null.
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 0004d4618..5ad31b17a 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/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) { |