Merge "Address API council suggestions for UserManager APIs" (4eb7c729) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -8757,7 +8757,9 @@ package android.os {

		public class UserManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void clearSeedAccountData();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle createProfile(@NonNull String, @NonNull String, @Nullable String[]) throws android.os.UserManager.UserOperationException;
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle createProfile(@NonNull String, @NonNull String, @NonNull java.util.Set<java.lang.String>) throws android.os.UserManager.UserOperationException;
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public java.util.List<android.os.UserHandle> getAllProfiles();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public java.util.List<android.os.UserHandle> getEnabledProfiles();
		method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getProfileParent(@NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountName();
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.PersistableBundle getSeedAccountOptions();
		@@ -8765,7 +8767,6 @@ package android.os {
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public long[] getSerialNumbersOfUsers(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserHandle> getUserHandles(boolean);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public android.graphics.Bitmap getUserIcon();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public java.util.List<android.os.UserHandle> getUserProfiles(boolean);
		method @Deprecated @android.os.UserManager.UserRestrictionSource @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public int getUserRestrictionSource(String, android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserManager.EnforcingUser> getUserRestrictionSources(String, android.os.UserHandle);
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public int getUserSwitchability();

core/java/android/os/UserManager.java

+35 −6

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Set;

		/**
		* Manages users and user details on a multi-user system. There are two major categories of
		@@ -2717,10 +2718,11 @@ public class UserManager {
		Manifest.permission.CREATE_USERS})
		@UserHandleAware
		public @Nullable UserHandle createProfile(@NonNull String name, @NonNull String userType,
		@Nullable String[] disallowedPackages) throws UserOperationException {
		@NonNull Set<String> disallowedPackages) throws UserOperationException {
		try {
		return mService.createProfileForUserWithThrow(name, userType, 0,
		mUserId, disallowedPackages).getUserHandle();
		mUserId, disallowedPackages.toArray(
		new String[disallowedPackages.size()])).getUserHandle();
		} catch (ServiceSpecificException e) {
		return returnNullOrThrowUserOperationException(e,
		mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R);
		@@ -3354,19 +3356,46 @@ public class UserManager {
		}

		/**
		* Returns a list of ids for profiles associated with the context user including the user
		* itself.
		* Returns a list of ids for enabled profiles associated with the context user including the
		* user itself.
		*
		* @param enabledOnly whether to return only {@link UserInfo#isEnabled() enabled} profiles
		* @return A non-empty list of UserHandles associated with the calling user.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,
		Manifest.permission.CREATE_USERS}, conditional = true)
		@UserHandleAware
		public @NonNull List<UserHandle> getEnabledProfiles() {
		return getProfiles(true);
		}

		/**
		* Returns a list of ids for all profiles associated with the context user including the user
		* itself.
		*
		* @return A non-empty list of UserHandles associated with the calling user.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,
		Manifest.permission.CREATE_USERS}, conditional = true)
		@UserHandleAware
		public @NonNull List<UserHandle> getUserProfiles(boolean enabledOnly) {
		public @NonNull List<UserHandle> getAllProfiles() {
		return getProfiles(false);
		}

		/**
		* Returns a list of ids for profiles associated with the context user including the user
		* itself.
		*
		* @param enabledOnly whether to return only {@link UserInfo#isEnabled() enabled} profiles
		* @return A non-empty list of UserHandles associated with the calling user.
		*/
		@RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,
		Manifest.permission.CREATE_USERS}, conditional = true)
		@UserHandleAware
		private @NonNull List<UserHandle> getProfiles(boolean enabledOnly) {
		final int[] userIds = getProfileIds(mUserId, enabledOnly);
		final List<UserHandle> result = new ArrayList<>(userIds.length);
		for (int userId : userIds) {

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -812,7 +812,7 @@ public final class UserManagerTest {
		"android", 0, mUserManager.getPrimaryUser().getUserHandle())
		.getSystemService(Context.USER_SERVICE);

		List<UserHandle> profiles = um.getUserProfiles(false);
		List<UserHandle> profiles = um.getAllProfiles();
		assertThat(profiles.size()).isEqualTo(2);
		assertThat(profiles.get(0).equals(userProfile.getUserHandle())
		\|\| profiles.get(1).equals(userProfile.getUserHandle())).isTrue();