Commit 866f1f34 authored Jun 03, 2023 by BK Choi Committed by Automerger Merge Worker Jun 03, 2023

Merge "Exclude a private display from...

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

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

Change-Id: I6ed5b5250b717757a88b65e7412009585e6dd39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -19527,7 +19527,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;
		}