diff --git a/core/api/system-current.txt b/core/api/system-current.txt index e77334358efd4..f05642f3a3a94 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -8616,6 +8616,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(); @@ -8627,7 +8628,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"; diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl index 34f2c103f8660..9a8194240f8e4 100644 --- a/core/java/android/os/IUserManager.aidl +++ b/core/java/android/os/IUserManager.aidl @@ -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, diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index d4de4fa655265..b8ad068dc74c5 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -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(); } diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 2a0257dd2a209..cf181565c82f5 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -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; } } diff --git a/services/core/java/com/android/server/pm/UserTypeDetails.java b/services/core/java/com/android/server/pm/UserTypeDetails.java index 6824f7d8fa558..92ec31b21e07a 100644 --- a/services/core/java/com/android/server/pm/UserTypeDetails.java +++ b/services/core/java/com/android/server/pm/UserTypeDetails.java @@ -154,7 +154,7 @@ public final class UserTypeDetails { * *

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 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() { diff --git a/services/core/java/com/android/server/pm/UserTypeFactory.java b/services/core/java/com/android/server/pm/UserTypeFactory.java index e8421a5d966d9..30cb40c342035 100644 --- a/services/core/java/com/android/server/pm/UserTypeFactory.java +++ b/services/core/java/com/android/server/pm/UserTypeFactory.java @@ -121,7 +121,7 @@ public final class UserTypeFactory { .setMaxAllowedPerParent(1) .setLabel(0) .setDefaultRestrictions(null) - .setSharesMediaWithParent(true); + .setIsMediaSharedWithParent(true); } /** diff --git a/services/core/java/com/android/server/storage/StorageSessionController.java b/services/core/java/com/android/server/storage/StorageSessionController.java index 5f5e6a3e6f462..8d79a81fe11eb 100644 --- a/services/core/java/com/android/server/storage/StorageSessionController.java +++ b/services/core/java/com/android/server/storage/StorageSessionController.java @@ -80,11 +80,11 @@ public final class StorageSessionController { public int getConnectionUserIdForVolume(VolumeInfo vol) { final Context volumeUserContext = mContext.createContextAsUser( UserHandle.of(vol.mountUserId), 0); - boolean sharesMediaWithParent = volumeUserContext.getSystemService( - UserManager.class).sharesMediaWithParent(); + boolean isMediaSharedWithParent = volumeUserContext.getSystemService( + UserManager.class).isMediaSharedWithParent(); UserInfo userInfo = mUserManager.getUserInfo(vol.mountUserId); - if (userInfo != null && sharesMediaWithParent) { + if (userInfo != null && isMediaSharedWithParent) { // Clones use the same connection as their parent return userInfo.profileGroupId; } else { diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java index fc2661103491d..b76c279a82bc6 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java @@ -175,7 +175,7 @@ public final class UserManagerTest { final Context userContext = mContext.createPackageContextAsUser("system", 0, UserHandle.of(userInfo.id)); assertThat(userContext.getSystemService( - UserManager.class).sharesMediaWithParent()).isTrue(); + UserManager.class).isMediaSharedWithParent()).isTrue(); List list = mUserManager.getUsers(); List cloneUsers = list.stream().filter(