diff options
author | Andrew Lee <anwlee@google.com> | 2015-03-19 14:43:29 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-03-19 14:43:29 -0700 |
commit | 0ad206a7d1bb21e2668405ccd7e08881db3a6dcd (patch) | |
tree | 5c64aea76dec57d0ee23bf508bd9f8254170f2aa /InCallUI | |
parent | f5c7142be9321d861605e945fb7d74cf6b761ef4 (diff) |
Finish activity before reveal if not setup.
This seems to be happening because it tries to start the circular
reveal before the InCallPresenter has been configured to start a
call. This is an error case; finish the activity to try to resolve
it more gracefully.
Bug: 19719403
Change-Id: I83240b88b7015d8709d5b4cb56a099a68c9c15ca
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); |