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

Commit 808daf5e authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "UserVisibilityMediator refactoring, step 3."

parents bdde7f69 e6aa1016

core/java/android/app/ActivityManager.java

+0 −2
Original line number Diff line number Diff line
@@ -4398,8 +4398,6 @@ public class ActivityManager { 
     *

     * @throws UnsupportedOperationException if the device does not support background users on

     * secondary displays.

     * @throws IllegalArgumentException if the display doesn't exist or is not a valid display to

     * start secondary users on.

     *

     * @hide

     */

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public abstract class UserManagerInternal { 
    public static final int USER_ASSIGNMENT_RESULT_SUCCESS_INVISIBLE = 2;

    public static final int USER_ASSIGNMENT_RESULT_FAILURE = -1;



    private static final String PREFIX_USER_ASSIGNMENT_RESULT = "USER_ASSIGNMENT_RESULT";

    private static final String PREFIX_USER_ASSIGNMENT_RESULT = "USER_ASSIGNMENT_RESULT_";

    @IntDef(flag = false, prefix = {PREFIX_USER_ASSIGNMENT_RESULT}, value = {

            USER_ASSIGNMENT_RESULT_SUCCESS_VISIBLE,

            USER_ASSIGNMENT_RESULT_SUCCESS_INVISIBLE,

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

+1 −2
Original line number Diff line number Diff line
@@ -1645,8 +1645,7 @@ public class UserManagerService extends IUserManager.Stub { 
        return isProfileUnchecked(userId);

    }



    // TODO(b/244644281): make it private once UserVisibilityMediator don't use it anymore

    boolean isProfileUnchecked(@UserIdInt int userId) {

    private boolean isProfileUnchecked(@UserIdInt int userId) {

        synchronized (mUsersLock) {

            UserInfo userInfo = getUserInfoLU(userId);

            return userInfo != null && userInfo.isProfile();

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

+188 −144

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/pm/UserVisibilityMediatorMUMDTest.java

+63 −100

File changed.

Preview size limit exceeded, changes collapsed.