commit d7007923c55994d64514706b212fa3e8c1a3b25f
author Hall Liu <hallliu@google.com> Wed Jun 01 00:25:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 00:25:05 2016 +0000
tree 830459216659fb385437b961644548994130d768
parent 21a608f27f1f7b9c0fcfbb982f290fed29cc1817
parent 45784f13ef6e159cbfb6e167aacb535732dcb803

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

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 197d9ec..637061d09 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3525,7 +3525,9 @@
     }
 
     void showLockTaskToast() {
-        mLockTaskNotify.showToast(mLockTaskModeState);
+        if (mLockTaskNotify != null) {
+            mLockTaskNotify.showToast(mLockTaskModeState);
+        }
     }
 
     void showLockTaskEscapeMessageLocked(TaskRecord task) {