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

Commit 43cd267a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the logic to check if extra display is already assigned." into main

parents 64d1c6d0 ccf78f64

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

+3 −3
Original line number Diff line number Diff line
@@ -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) {