diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:09:55 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:43 -0700 |
| commit | cacdaa4aeedc6b0817eba92a83b8e5edfe27f637 (patch) | |
| tree | f12313a55eeaa75f4faff3e1d134dc349420f094 /services/core/java/com/android/server/am/ActivityStackSupervisor.java | |
| parent | 1ab48a3666118e40cf56142c886a7217b92d0d4a (diff) | |
| parent | 4e4743a354e26467318b437892a9980eb9b8328a (diff) | |
| download | frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.zip frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.gz frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.bz2 | |
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Ib003ccb606e0d77209291b757ea36399d3b65814
Diffstat (limited to 'services/core/java/com/android/server/am/ActivityStackSupervisor.java')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 28ea006..49b13c5 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -3936,7 +3936,9 @@ public final class ActivityStackSupervisor implements DisplayListener { } void showLockTaskToast() { - mLockTaskNotify.showToast(mLockTaskModeState); + if (mLockTaskNotify != null) { + mLockTaskNotify.showToast(mLockTaskModeState); + } } void showLockTaskEscapeMessageLocked(TaskRecord task) { |