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

Commit 8a3013cd authored by BK Choi's avatar BK Choi Committed by Automerger Merge Worker
Browse files

Merge "Exclude a private display from... 

Merge "Exclude a private display from getDisplayIdsForStartingVisibleBackgroundUsers" into udc-qpr-dev am: c6308f4d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23493421



Change-Id: Ie20d2be72a154e140fbebfe4e6825f1a45f86297
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e528b34 c6308f4d

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

+1 −1
Original line number Diff line number Diff line
@@ -19525,7 +19525,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            for (Display display : allDisplays) {

                int displayId = display.getDisplayId();

                // TODO(b/247592632): check other properties like isSecure or proper display type

                if (display.isValid()

                if (display.isValid() && ((display.getFlags() & Display.FLAG_PRIVATE) == 0)

                        && (allowOnDefaultDisplay || displayId != Display.DEFAULT_DISPLAY)) {

                    displayIds[numberValidDisplays++] = displayId;

                }