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

Commit ed8a8877 authored by Saumya Pathak's avatar Saumya Pathak Committed by Automerger Merge Worker
Browse files

Merge "Renaming sharesMediaWithParent on API feedback" into sc-dev am: 8bc88258 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234548

Change-Id: Ifd6ceaf69a13ae2cfb406b3a39c31fbb7ebe8f62
parents 75c252f9 8bc88258

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8632,6 +8632,7 @@ package android.os { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isCloneProfile();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isGuestUser();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isManagedProfile(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isMediaSharedWithParent();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isPrimaryUser();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isProfile();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isRestrictedProfile();
@@ -8643,7 +8644,6 @@ package android.os { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean removeUser(@NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserIcon(@NonNull android.graphics.Bitmap) throws android.os.UserManager.UserOperationException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setUserName(@Nullable String);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean sharesMediaWithParent();

    field public static final String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED";

    field @Deprecated public static final String DISALLOW_OEM_UNLOCK = "no_oem_unlock";

    field public static final String DISALLOW_RUN_IN_BACKGROUND = "no_run_in_background";

core/java/android/os/IUserManager.aidl

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

    boolean isManagedProfile(int userId);

    boolean isCloneProfile(int userId);

    boolean sharesMediaWithParent(int userId);

    boolean isMediaSharedWithParent(int userId);

    boolean isDemoUser(int userId);

    boolean isPreCreated(int userId);

    UserInfo createProfileForUserEvenWhenDisallowedWithThrow(in String name, in String userType, int flags,

core/java/android/os/UserManager.java

+2 −2
Original line number Diff line number Diff line
@@ -4124,9 +4124,9 @@ public class UserManager { 
            Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)

    @UserHandleAware

    @SuppressAutoDoc

    public boolean sharesMediaWithParent() {

    public boolean isMediaSharedWithParent() {

        try {

            return mService.sharesMediaWithParent(mUserId);

            return mService.isMediaSharedWithParent(mUserId);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -1516,13 +1516,13 @@ public class UserManagerService extends IUserManager.Stub { 
    }



    @Override

    public boolean sharesMediaWithParent(@UserIdInt int userId) {

    public boolean isMediaSharedWithParent(@UserIdInt int userId) {

        checkManageOrInteractPermissionIfCallerInOtherProfileGroup(userId,

                "sharesMediaWithParent");

                "isMediaSharedWithParent");

        synchronized (mUsersLock) {

            UserTypeDetails userTypeDetails = getUserTypeDetailsNoChecks(userId);

            return userTypeDetails != null ? userTypeDetails.isProfile()

                    && userTypeDetails.sharesMediaWithParent() : false;

                    && userTypeDetails.isMediaSharedWithParent() : false;

        }

    }

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

+10 −10
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public final class UserTypeDetails { 
     *

     * <p> Default value is false

     */

    private final boolean mSharesMediaWithParent;

    private final boolean mIsMediaSharedWithParent;



    private UserTypeDetails(@NonNull String name, boolean enabled, int maxAllowed,

            @UserInfoFlag int baseType, @UserInfoFlag int defaultUserInfoPropertyFlags, int label,
@@ -166,7 +166,7 @@ public final class UserTypeDetails { 
            @Nullable Bundle defaultSystemSettings,

            @Nullable Bundle defaultSecureSettings,

            @Nullable List<DefaultCrossProfileIntentFilter> defaultCrossProfileIntentFilters,

            boolean sharesMediaWithParent) {

            boolean isMediaSharedWithParent) {

        this.mName = name;

        this.mEnabled = enabled;

        this.mMaxAllowed = maxAllowed;
@@ -185,7 +185,7 @@ public final class UserTypeDetails { 
        this.mBadgeLabels = badgeLabels;

        this.mBadgeColors = badgeColors;

        this.mDarkThemeBadgeColors = darkThemeBadgeColors;

        this.mSharesMediaWithParent = sharesMediaWithParent;

        this.mIsMediaSharedWithParent = isMediaSharedWithParent;

    }



    /**
@@ -303,8 +303,8 @@ public final class UserTypeDetails { 
    /**

     * Returns true if the user has shared media with parent user or false otherwise.

     */

    public boolean sharesMediaWithParent() {

        return mSharesMediaWithParent;

    public boolean isMediaSharedWithParent() {

        return mIsMediaSharedWithParent;

    }



    /** Returns a {@link Bundle} representing the default user restrictions. */
@@ -398,7 +398,7 @@ public final class UserTypeDetails { 
        private @DrawableRes int mIconBadge = Resources.ID_NULL;

        private @DrawableRes int mBadgePlain = Resources.ID_NULL;

        private @DrawableRes int mBadgeNoBackground = Resources.ID_NULL;

        private boolean mSharesMediaWithParent = false;

        private boolean mIsMediaSharedWithParent = false;



        public Builder setName(String name) {

            mName = name;
@@ -491,10 +491,10 @@ public final class UserTypeDetails { 


        /**

         * Sets shared media property for the user.

         * @param sharesMediaWithParent the value to be set, true or false

         * @param isMediaSharedWithParent the value to be set, true or false

         */

        public Builder setSharesMediaWithParent(boolean sharesMediaWithParent) {

            mSharesMediaWithParent = sharesMediaWithParent;

        public Builder setIsMediaSharedWithParent(boolean isMediaSharedWithParent) {

            mIsMediaSharedWithParent = isMediaSharedWithParent;

            return this;

        }
@@ -527,7 +527,7 @@ public final class UserTypeDetails { 
                    mIconBadge, mBadgePlain, mBadgeNoBackground, mBadgeLabels, mBadgeColors,

                    mDarkThemeBadgeColors == null ? mBadgeColors : mDarkThemeBadgeColors,

                    mDefaultRestrictions, mDefaultSystemSettings, mDefaultSecureSettings,

                    mDefaultCrossProfileIntentFilters, mSharesMediaWithParent);

                    mDefaultCrossProfileIntentFilters, mIsMediaSharedWithParent);

        }



        private boolean hasBadge() {