Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check the managed profile for PO" into tm-dev

Browse Source
This commit is contained in:
Antoan Angelov
2022-03-21 20:02:54 +00:00
committed by Android (Google) Code Review
parent 0581af174c a107680e22
commit e235e7f579
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -18842,14 +18842,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
public List<UserHandle> getPolicyManagedProfiles(@NonNull UserHandle user) { public List<UserHandle> getPolicyManagedProfiles(@NonNull UserHandle user) {
Preconditions.checkCallAuthorization(hasCallingOrSelfPermission( Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(
android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)); android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS));
int userId = user.getIdentifier(); int userId = user.getIdentifier();
return mInjector.binderWithCleanCallingIdentity(() -> { return mInjector.binderWithCleanCallingIdentity(() -> {
List<UserInfo> userProfiles = mUserManager.getProfiles(userId); List<UserInfo> userProfiles = mUserManager.getProfiles(userId);
List<UserHandle> result = new ArrayList<>(); List<UserHandle> result = new ArrayList<>();
for (int i = 0; i < userProfiles.size(); i++) { for (int i = 0; i < userProfiles.size(); i++) {
if (userProfiles.get(i).isManagedProfile() && hasProfileOwner(userId)) { UserInfo userInfo = userProfiles.get(i);
result.add(new UserHandle(userProfiles.get(i).id)); if (userInfo.isManagedProfile() && hasProfileOwner(userInfo.id)) {
result.add(new UserHandle(userInfo.id));
} }
} }
return result; return result;