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

Commit c035009a authored by bkchoi's avatar bkchoi Committed by BK Choi
Browse files

Rename getDisplayAssignedToUser() to getMainDisplayAssignedToUser(). 

Now we have getDisplaysAssignedToUser() methods that returns all
displays assigned to a user, we are renaming the existing
getDisplayAssignedToUser() method to getMainDisplayAssignedToUser() to
make it more clear that it only returns a main display, and to avoid
potential confusion.

Bug: 272366483

Test: atest UserVisibilityMediatorSUSDTest \
            UserVisibilityMediatorMUMDTest \
            UserVisibilityMediatorMUPANDTest \
            UserVisibilityTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:337ffa18d572f6b4ed8bab84f7243522e748e021)
Change-Id: Ia6dd667774c9eedd06c5dbb42575ca865b610994
parent 9cb16861

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2251,7 +2251,7 @@ package android.os { 
    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle getBootUser();

    method public int getDisplayIdAssignedToUser();

    method public int getMainDisplayIdAssignedToUser();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean);

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ public class Instrumentation { 
        }



        UserManager userManager = mInstrContext.getSystemService(UserManager.class);

        int userDisplayId = userManager.getDisplayIdAssignedToUser();

        int userDisplayId = userManager.getMainDisplayIdAssignedToUser();

        if (VERBOSE) {

            Log.v(TAG, "setDisplayIfNeeded(" + event + "): eventDisplayId=" + eventDisplayId

                    + ", user=" + mInstrContext.getUser() + ", userDisplayId=" + userDisplayId);

core/java/android/os/IUserManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ interface IUserManager { 
    boolean isUserForeground(int userId);

    boolean isUserVisible(int userId);

    int[] getVisibleUsers();

    int getDisplayIdAssignedToUser();

    int getMainDisplayIdAssignedToUser();

    boolean isUserNameSet(int userId);

    boolean hasRestrictedProfiles(int userId);

    boolean requestQuietModeEnabled(String callingPackage, boolean enableQuietMode, int userId, in IntentSender target, int flags);

core/java/android/os/UserManager.java

+3 −3
Original line number Diff line number Diff line
@@ -3067,14 +3067,14 @@ public class UserManager { 
    }



    /**

     * See {@link com.android.server.pm.UserManagerInternal#getDisplayAssignedToUser(int)}.

     * See {@link com.android.server.pm.UserManagerInternal#getMainDisplayAssignedToUser(int)}.

     *

     * @hide

     */

    @TestApi

    public int getDisplayIdAssignedToUser() {

    public int getMainDisplayIdAssignedToUser() {

        try {

            return mService.getDisplayIdAssignedToUser();

            return mService.getMainDisplayIdAssignedToUser();

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

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

+2 −3
Original line number Diff line number Diff line
@@ -506,15 +506,14 @@ public abstract class UserManagerInternal { 
     *

     * <p>If the user is a profile and is running, it's assigned to its parent display.

     */

    // TODO(b/272366483) rename this method to avoid confusion with getDisplaysAssignedTOUser().

    public abstract int getDisplayAssignedToUser(@UserIdInt int userId);

    public abstract int getMainDisplayAssignedToUser(@UserIdInt int userId);



    /**

     * Returns all display ids assigned to the user including {@link

     * #assignUserToExtraDisplay(int, int) extra displays}, or {@code null} if there is no display

     * assigned to the specified user.

     *

     * <p>Note that this method is different from {@link #getDisplayAssignedToUser(int)}, which

     * <p>Note that this method is different from {@link #getMainDisplayAssignedToUser(int)}, which

     * returns a main display only.

     */

    public abstract @Nullable int[] getDisplaysAssignedToUser(@UserIdInt int userId);