diff options
| author | Andrew Lee <anwlee@google.com> | 2014-12-16 18:48:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-16 18:48:49 +0000 |
| commit | f14a8057bb7e87c163ad6093e03c398cb416a2a0 (patch) | |
| tree | 5341fde108154445118671f60bb04b2a437a69bd /InCallUI | |
| parent | 31af66a49550f98a0382ceebd638690d52a59f3e (diff) | |
| parent | c08484b1fc4c4001f59ae963ce6082209ac00172 (diff) | |
Merge "Use mInCallActivity if mContext is null." into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
| -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) { |