Merge "Modify getUserAssignedToDisplay to handle the extra displays" into main (906a8ada) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserVisibilityMediator.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -572,7 +572,7 @@ public final class UserVisibilityMediator implements Dumpable {
		return false;
		}

		// First check if the user started on display
		// First check if the user is assigned to a display
		int userAssignedToDisplay = getUserStartedOnDisplay(displayId);
		if (userAssignedToDisplay != USER_NULL) {
		Slogf.w(TAG, "assignUserToExtraDisplay(%d, %d): failed because display was assigned"
		@@ -918,9 +918,15 @@ public final class UserVisibilityMediator implements Dumpable {
		if (!isStartedVisibleProfileLocked(userId)) {
		return userId;
		} else if (DBG) {
		Slogf.d(TAG, "getUserAssignedToDisplay(%d): skipping user %d because it's "
		+ "a profile", displayId, userId);
		Slogf.d(TAG,
		"getUserAssignedToDisplay(%d): skipping user %d because it's a profile",
		displayId, userId);
		}
		}
		int userAssignedToExtraDisplay = mExtraDisplaysAssignedToUsers.get(displayId,
		USER_NULL);
		if (userAssignedToExtraDisplay != USER_NULL) {
		return userAssignedToExtraDisplay;
		}
		}
		if (!returnCurrentUserByDefault) {