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

Browse Source 
am: 1f1f29ece6

* commit '1f1f29ece6f93b53cb44140b271927c198615113':
  Add null check in showLockTaskToast

Change-Id: I4398b476dfd86c807a452b09b789214b44e7ccdd
This commit is contained in:
Hall Liu
2016-06-01 00:40:18 +00:00
committed by android-build-merger
parent f94cd49aa4 1f1f29ece6
commit 6a8cc5976a
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) {