From ccf78f645be4c292ffca8bf15c839fa13c8a6453 Mon Sep 17 00:00:00 2001 From: "hyunjae.choi" Date: Wed, 24 Jul 2024 15:30:43 +0000 Subject: Fix the logic to check if extra display is already assigned. Check whether a user is already assigned to the requested extra display. Bug: 354837901 Flag: EXEMPT bugfix Test: atest CtsAccessibilityServiceTestCases:AccessibilityDisplayProxyTest#testRegisterAccessibilityProxy_withNonDeviceDisplay_throwsSecurityException Test: atest FrameworksMockingServicesTests:UserVisibilityMediatorSUSDTest Test: atest FrameworksMockingServicesTests:UserVisibilityMediatorMUMDTest Test: atest FrameworksMockingServicesTests:UserVisibilityMediatorMUPANDTest (cherry picked from https://partner-android-review.googlesource.com/q/commit:0e4e4691615862d0c04c9a0d651b79025af54452) Change-Id: Ia5c4713ed46e0823dc1aa44fb3032a3999191aa3 --- .../core/java/com/android/server/pm/UserVisibilityMediator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/UserVisibilityMediator.java b/services/core/java/com/android/server/pm/UserVisibilityMediator.java index 613ebd384b2a..46207c1860c0 100644 --- a/services/core/java/com/android/server/pm/UserVisibilityMediator.java +++ b/services/core/java/com/android/server/pm/UserVisibilityMediator.java @@ -579,11 +579,11 @@ public final class UserVisibilityMediator implements Dumpable { + " to user %d on start", userId, displayId, userAssignedToDisplay); return false; } - // Then if was assigned extra - userAssignedToDisplay = mExtraDisplaysAssignedToUsers.get(userId, USER_NULL); + // Then if the display was assigned before + userAssignedToDisplay = mExtraDisplaysAssignedToUsers.get(displayId, USER_NULL); if (userAssignedToDisplay != USER_NULL) { Slogf.w(TAG, "assignUserToExtraDisplay(%d, %d): failed because user %d was already " - + "assigned that extra display", userId, displayId, userAssignedToDisplay); + + "assigned to extra display", userId, displayId, userAssignedToDisplay); return false; } if (DBG) { -- cgit v1.2.3-59-g8ed1b