commit | 45784f13ef6e159cbfb6e167aacb535732dcb803 | [log] [tgz] |
---|---|---|
author | Hall Liu <hallliu@google.com> | Tue May 31 15:50:48 2016 -0700 |
committer | Hall Liu <hallliu@google.com> | Tue May 31 15:50:48 2016 -0700 |
tree | a38c2ad9d49ba1b94e8153cf623f01d6db775b5b | |
parent | 8b655e0f57b071756e7d6a3547eeabe35885bcc9 [diff] |
Add null check in showLockTaskToast Bug: 29056498 Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
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) {