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

Browse Source
This commit is contained in:
Hall Liu
2016-06-01 00:25:04 +00:00
committed by Android (Google) Code Review
parent 21a608f27f 45784f13ef
commit d7007923c5
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() { void showLockTaskToast() {
mLockTaskNotify.showToast(mLockTaskModeState); if (mLockTaskNotify != null) {
mLockTaskNotify.showToast(mLockTaskModeState);
}
} }
void showLockTaskEscapeMessageLocked(TaskRecord task) { void showLockTaskEscapeMessageLocked(TaskRecord task) {