commit 473b8b09b063799411b5233ab034a154f86a5f64
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 24 20:41:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 20:41:14 2018 +0000
tree b2e95c538d5431340c1bee7daf182ae39e4e23dc
parent d49118bd484912c7500cbf173a1debe1726d1ceb
parent c2ea364e77e4a649409bc5a831490db8f59b4904

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

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index afad0b1..7310fab 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2554,6 +2554,10 @@
             final int displayId = mTmpOrderedDisplayIds.get(i);
             // If a display is registered in WM, it must also be available in AM.
             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) {
                 final ActivityStack stack = display.getChildAt(j);
                 if (ignoreCurrent && stack == currentFocus) {