Merge "Remove UM.isUserOfType(userHandle) API"

3 files changed, 9 insertions, 31 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index b99ddb313ce0..0930f68e7b1a 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8961,7 +8961,6 @@ package android.os {
     method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isSameProfileGroup(@NonNull android.os.UserHandle, @NonNull android.os.UserHandle);
     method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public boolean isUserNameSet();
     method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isUserOfType(@NonNull String);
-    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isUserOfType(@NonNull android.os.UserHandle, @NonNull String);
     method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isUserUnlockingOrUnlocked(@NonNull android.os.UserHandle);
     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;
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 3564589e35a4..6ed1d2c345f8 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -1775,9 +1775,10 @@ public class UserManager {
     }
 
     /**
-     * Returns whether the context user's user is of the given user type, such as
-     * {@link UserManager#USER_TYPE_FULL_GUEST}.
+     * Returns whether the context user is of the given user type.
      *
+     * @param userType the name of the user's user type, e.g.
+     *                 {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
      * @return true if the user is of the given user type.
      * @hide
      */
@@ -1793,26 +1794,6 @@ public class UserManager {
     }
 
     /**
-     * Returns whether the given user is of the given user type, such as
-     * {@link UserManager#USER_TYPE_FULL_GUEST}.
-     *
-     * @param userHandle the user handle of the user whose type is being requested.
-     * @param userType the name of the user's user type, e.g.
-     *                 {@link UserManager#USER_TYPE_PROFILE_MANAGED}.
-     * @return true if the userHandle user is of type userType
-     * @hide
-     */
-    @SystemApi
-    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
-    public boolean isUserOfType(@NonNull UserHandle userHandle, @NonNull String userType) {
-        try {
-            return mService.isUserOfType(userHandle.getIdentifier(), userType);
-        } catch (RemoteException re) {
-            throw re.rethrowFromSystemServer();
-        }
-    }
-
-    /**
      * Returns whether the user type is a
      * {@link UserManager#USER_TYPE_PROFILE_MANAGED managed profile}.
      * @hide
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 2469cec5766e..118c540a4131 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -336,9 +336,6 @@ public final class UserManagerTest {
         assertThat(userInfo).isNotNull();
         final int userId = userInfo.id;
 
-        UserManager userManagerForUser = (UserManager) mContext.createPackageContextAsUser(
-                "android", 0, asHandle(userId)).getSystemService(Context.USER_SERVICE);
-
         assertThat(mUserManager.hasBadge(userId)).isEqualTo(userTypeDetails.hasBadge());
         assertThat(mUserManager.getUserIconBadgeResId(userId))
                 .isEqualTo(userTypeDetails.getIconBadge());
@@ -346,17 +343,18 @@ public final class UserManagerTest {
                 .isEqualTo(userTypeDetails.getBadgePlain());
         assertThat(mUserManager.getUserBadgeNoBackgroundResId(userId))
                 .isEqualTo(userTypeDetails.getBadgeNoBackground());
-        assertThat(mUserManager.isUserOfType(asHandle(userId), userTypeDetails.getName()))
-                .isTrue();
-        assertThat(userManagerForUser.isProfile()).isEqualTo(userTypeDetails.isProfile());
-        assertThat(userManagerForUser.isUserOfType(asHandle(userId), userTypeDetails.getName()))
-                .isTrue();
 
         final int badgeIndex = userInfo.profileBadge;
         assertThat(mUserManager.getUserBadgeColor(userId)).isEqualTo(
                 Resources.getSystem().getColor(userTypeDetails.getBadgeColor(badgeIndex), null));
         assertThat(mUserManager.getBadgedLabelForUser("Test", asHandle(userId))).isEqualTo(
                 Resources.getSystem().getString(userTypeDetails.getBadgeLabel(badgeIndex), "Test"));
+
+        // Test @UserHandleAware methods
+        final UserManager userManagerForUser = UserManager.get(mContext.createPackageContextAsUser(
+                "android", 0, asHandle(userId)));
+        assertThat(userManagerForUser.isUserOfType(userTypeDetails.getName())).isTrue();
+        assertThat(userManagerForUser.isProfile()).isEqualTo(userTypeDetails.isProfile());
     }
 
     // Make sure only max managed profiles can be created