Finish activity before reveal if not setup.

automerge: c5722b4

* commit 'c5722b4638a4807a3accbd85822eeb7c09973c44':
  Finish activity before reveal if not setup.

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);