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

Merge "Added display null check to ActivityStackSupervisor.getNextFocusableStackLocked" into pi-dev

Browse Source 
am: 473b8b09b0

Change-Id: I7fb50faab7f5eeb760eb698f95ccb03ea95bb38f
This commit is contained in:
Wale Ogunwale
2018-05-24 14:22:04 -07:00
committed by android-build-merger
parent 78351af8c4 473b8b09b0
commit 64ac4ee699
1 changed files with 4 additions and 0 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

@@ -2554,6 +2554,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
final int displayId = mTmpOrderedDisplayIds.get(i); final int displayId = mTmpOrderedDisplayIds.get(i);
// If a display is registered in WM, it must also be available in AM. // If a display is registered in WM, it must also be available in AM.
final ActivityDisplay display = getActivityDisplayOrCreateLocked(displayId); final ActivityDisplay display = getActivityDisplayOrCreateLocked(displayId);
if (display == null) {
// Looks like the display no longer exists in the system...
continue;
}
for (int j = display.getChildCount() - 1; j >= 0; --j) { for (int j = display.getChildCount() - 1; j >= 0; --j) {
final ActivityStack stack = display.getChildAt(j); final ActivityStack stack = display.getChildAt(j);
if (ignoreCurrent && stack == currentFocus) { if (ignoreCurrent && stack == currentFocus) {