diff options
author | Andrew Lee <anwlee@google.com> | 2015-03-19 22:15:56 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-03-19 22:15:56 +0000 |
commit | 8f299d48242b85b8167a1e3de885f16a23fd522c (patch) | |
tree | 1e9f513ae32d9dd4623d368b4999151c6c9a39dc /InCallUI | |
parent | 5894bc8a4043b6e5122581b77e91b42dbdefceca (diff) | |
parent | 0ad206a7d1bb21e2668405ccd7e08881db3a6dcd (diff) |
Finish activity before reveal if not setup.
automerge: c5722b4
* commit 'c5722b4638a4807a3accbd85822eeb7c09973c44':
Finish activity before reveal if not setup.
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index ce6d439d1..7c71d2c86 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -1143,6 +1143,12 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { mHandler.post(new Runnable() { @Override public void run() { + if (mContext == null) { + Log.e(this, "Setup did not occur before showing the InCallActivity."); + activity.finish(); + return; + } + Log.i(this, "Showing InCallActivity after circular reveal"); final Intent intent = getInCallIntent(mShowDialpadOnStart, true, false, false); |