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

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

Change-Id: Ie20d2be72a154e140fbebfe4e6825f1a45f86297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
BK Choi
2023-06-03 17:26:09 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}