From 3f7d81ec4a91afa691274127eaed2149af37b082 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Wed, 16 Feb 2022 12:06:16 -0800 Subject: [PATCH] UserManagerService.hasManagedProfile fix hasManagedProfile checks if it has a profile, not necessarily a managed profile. There's no reason to limit the check specifically to managed profiles though. Test: none Bug: 31000380 Bug: 170249807 Change-Id: Iba33528ecdddc5d5034ae6733241cbe1cfd4da7e --- services/core/java/com/android/server/pm/ComputerEngine.java | 4 ++-- .../core/java/com/android/server/pm/UserManagerService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index 30ac1b85e7c33..f1a8734aa8567 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -2812,8 +2812,8 @@ public class ComputerEngine implements Computer { "MATCH_ANY_USER flag requires INTERACT_ACROSS_USERS permission"); } else if ((flags & PackageManager.MATCH_UNINSTALLED_PACKAGES) != 0 && isCallerSystemUser - && mUserManager.hasManagedProfile(UserHandle.USER_SYSTEM)) { - // If the caller wants all packages and has a restricted profile associated with it, + && mUserManager.hasProfile(UserHandle.USER_SYSTEM)) { + // If the caller wants all packages and has a profile associated with it, // then match all users. This is to make sure that launchers that need to access //work // profile apps don't start breaking. TODO: Remove this hack when launchers stop diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index b7c55c57c6ce1..fed214fd5ab00 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -6263,11 +6263,11 @@ public class UserManagerService extends IUserManager.Stub { } /** - * Checks if the given user has a managed profile associated with it. + * Checks if the given user has a profile associated with it. * @param userId The parent user * @return */ - boolean hasManagedProfile(@UserIdInt int userId) { + boolean hasProfile(@UserIdInt int userId) { synchronized (mUsersLock) { UserInfo userInfo = getUserInfoLU(userId); final int userSize = mUsers.size();