From 0ad206a7d1bb21e2668405ccd7e08881db3a6dcd Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 19 Mar 2015 14:43:29 -0700 Subject: 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 --- InCallUI/src/com/android/incallui/InCallPresenter.java | 6 ++++++ 1 file changed, 6 insertions(+) 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); -- cgit v1.2.3