Merge "Add UserManager#getUserHandles() as SystemApi" (3c75f063) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6492,6 +6492,7 @@ package android.os {
	method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.PersistableBundle getSeedAccountOptions();		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.PersistableBundle getSeedAccountOptions();
	method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountType();		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountType();
	method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public long[] getSerialNumbersOfUsers(boolean);		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 @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public android.graphics.Bitmap getUserIcon();
	method @Deprecated @android.os.UserManager.UserRestrictionSource @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public int getUserRestrictionSource(String, android.os.UserHandle);		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(android.Manifest.permission.MANAGE_USERS) public java.util.List<android.os.UserManager.EnforcingUser> getUserRestrictionSources(String, android.os.UserHandle);

core/java/android/os/UserManager.java

+33 −15

Original line number	Original line	Diff line number	Diff line
	@@ -2708,6 +2708,21 @@ public class UserManager {
	return getUsers(/* excludeDying= */ false);		return getUsers(/* excludeDying= */ false);
	}		}

			/**
			* Returns information for all users on this device. Requires
			* {@link android.Manifest.permission#MANAGE_USERS} permission.
			*
			* @param excludeDying specify if the list should exclude users being
			* removed.
			* @return the list of users that were created.
			* @hide
			*/
			@UnsupportedAppUsage
			public @NonNull List<UserInfo> getUsers(boolean excludeDying) {
			return getUsers(/excludePartial= / true, excludeDying,
			/* excludePreCreated= */ true);
			}

	/**		/**
	* Returns information for all users on this device, based on the filtering parameters.		* Returns information for all users on this device, based on the filtering parameters.
	*		*
	@@ -2723,6 +2738,24 @@ public class UserManager {
	}		}
	}		}

			/**
			* Returns the user handles for all users on this device, based on the filtering parameters.
			*
			* @param excludeDying specify if the list should exclude users being removed.
			* @return the list of user handles.
			* @hide
			*/
			@SystemApi
			@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
			public @NonNull List<UserHandle> getUserHandles(boolean excludeDying) {
			List<UserInfo> users = getUsers(excludeDying);
			List<UserHandle> result = new ArrayList<>(users.size());
			for (UserInfo user : users) {
			result.add(user.getUserHandle());
			}
			return result;
			}

	/**		/**
	* Returns serial numbers of all users on this device.		* Returns serial numbers of all users on this device.
	*		*
	@@ -3262,21 +3295,6 @@ public class UserManager {
	}		}
	}		}

	/**
	* Returns information for all users on this device. Requires
	* {@link android.Manifest.permission#MANAGE_USERS} permission.
	*
	* @param excludeDying specify if the list should exclude users being
	* removed.
	* @return the list of users that were created.
	* @hide
	*/
	@UnsupportedAppUsage
	public @NonNull List<UserInfo> getUsers(boolean excludeDying) {
	return getUsers(/excludePartial= / true, excludeDying,
	/* excludePreCreated= */ true);
	}

	/**		/**
	* Removes a user and all associated data.		* Removes a user and all associated data.
	* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.		* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.

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

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -703,6 +703,21 @@ public class UserManagerTest extends AndroidTestCase {
	assertEquals(canBeCreatedCount, created.get());		assertEquals(canBeCreatedCount, created.get());
	}		}

			@MediumTest
			public void testGetUserHandles_createNewUser_shouldFindNewUser() {
			UserInfo user = createUser("Guest 1", UserManager.USER_TYPE_FULL_GUEST, /flags/ 0);

			boolean found = false;
			List<UserHandle> userHandles = mUserManager.getUserHandles(/* excludeDying= */ true);
			for (UserHandle userHandle: userHandles) {
			if (userHandle.getIdentifier() == user.id) {
			found = true;
			}
			}

			assertTrue(found);
			}

	private boolean isPackageInstalledForUser(String packageName, int userId) {		private boolean isPackageInstalledForUser(String packageName, int userId) {
	try {		try {
	return mPackageManager.getPackageInfoAsUser(packageName, 0, userId) != null;		return mPackageManager.getPackageInfoAsUser(packageName, 0, userId) != null;