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

Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f

Browse Source 
am: 561df62a52

* commit '561df62a523fdc78616db66b6f24ac7b10f57eb9':
  Add null check in showLockTaskToast

Change-Id: I5d7b851dbee2de45e9f0b184e3f5eb1722707946
This commit is contained in:
Sergei Vasilinetc
2016-06-01 00:42:32 +00:00
committed by android-build-merger
parent f94cd49aa4 561df62a52
commit 64d3e62cd5
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) {