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 | 4383e5db52f0c5b6cb117141114e7394e3d68a2c (patch) | |
| tree | 20b09619824b3e3217685ca30fb0dfb643d7befa | |
| parent | 2396cf49da58acc397d450be1db78ad7d3640e9c (diff) | |
| parent | ddaed9152c17a83930ba4c8229b48cc1be676157 (diff) | |
| download | packages_apps_InCallUI-4383e5db52f0c5b6cb117141114e7394e3d68a2c.tar.gz packages_apps_InCallUI-4383e5db52f0c5b6cb117141114e7394e3d68a2c.tar.bz2 packages_apps_InCallUI-4383e5db52f0c5b6cb117141114e7394e3d68a2c.zip | |
Merge "Use mInCallActivity if mContext is null." into lmp-mr1-dev
| -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) { |