Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check in showLockTaskToast" into nyc-dev am: d7007923c5 am: 1f1f29ece6

Browse Source 
am: 6a8cc5976a

* commit '6a8cc5976affb0f3b570250ed7e4b5777ea6ee64':
  Add null check in showLockTaskToast

Change-Id: I3aef910d2bc9b8c6efcb2deeff334f1f09e91ca6
This commit is contained in:
Hall Liu
2016-06-01 00:51:10 +00:00
committed by android-build-merger
parent 8bffb65356 6a8cc5976a
commit 391e0214f5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -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) {