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 
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb
This commit is contained in:
Hall Liu
2016-06-01 00:33:39 +00:00
committed by android-build-merger
parent c4d91f0bbf d7007923c5
commit 561df62a52
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3525,8 +3525,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
} }
void showLockTaskToast() { void showLockTaskToast() {
if (mLockTaskNotify != null) {
mLockTaskNotify.showToast(mLockTaskModeState); mLockTaskNotify.showToast(mLockTaskModeState);
} }
}
void showLockTaskEscapeMessageLocked(TaskRecord task) { void showLockTaskEscapeMessageLocked(TaskRecord task) {
if (mLockTaskModeTasks.contains(task)) { if (mLockTaskModeTasks.contains(task)) {