Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18640073 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Added display null check to... 

Merge "Added display null check to ActivityStackSupervisor.getNextFocusableStackLocked" into pi-dev am: 473b8b09
am: 64ac4ee6

Change-Id: I241d016f874cd5b6f169c5132b8ec23d10753351
parents c8981b77 64ac4ee6

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

+4 −0
Original line number Diff line number Diff line
@@ -2554,6 +2554,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
            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) {