Merge "Add null check in showLockTaskToast" into nyc-dev

2016-06-01 00:25:04 +00:00
parent 21a608f27f 45784f13ef
commit d7007923c5
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) {