summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--InCallUI/src/com/android/incallui/InCallPresenter.java6
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);