Add null check in showLockTaskToast

Bug: 29056498 Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
2016-05-31 15:50:48 -07:00
parent 8b655e0f57
commit 45784f13ef
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3525,7 +3525,9 @@ public final class ActivityStackSupervisor implements DisplayListener {
    }

    void showLockTaskToast() {
-        mLockTaskNotify.showToast(mLockTaskModeState);
+        if (mLockTaskNotify != null) {
+            mLockTaskNotify.showToast(mLockTaskModeState);
+        }
    }

    void showLockTaskEscapeMessageLocked(TaskRecord task) {