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
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index ce6d439..7c71d2c 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -1143,6 +1143,12 @@
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);