Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9a7c794 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed DPMS.listForegroundAffiliatedUsers()." into sc-dev am: 9693ec26 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14317042

Change-Id: Ib68a4895a0aa44609610d9c87f667ba9477d8d06
parents e7b8a724 9693ec26

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+17 −16
Original line number Diff line number Diff line
@@ -8903,17 +8903,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    }















    @Override













    public ComponentName getProfileOwnerAsUser(int userHandle) {













    public ComponentName getProfileOwnerAsUser(int userId) {















        if (!mHasFeature) {















            return null;















        }













        Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId");













        Preconditions.checkArgumentNonnegative(userId, "Invalid userId");



























        final CallerIdentity caller = getCallerIdentity();













        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userHandle));













        CallerIdentity caller = getCallerIdentity();













        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));





























        synchronized (getLockObject()) {













            return mOwners.getProfileOwnerComponent(userHandle);













            return mOwners.getProfileOwnerComponent(userId);















        }















    }
























@@ -9357,8 +9357,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    public List<UserHandle> listForegroundAffiliatedUsers() {















        checkIsDeviceOwner(getCallerIdentity());



























        int userId = mInjector.binderWithCleanCallingIdentity(() -> getCurrentForegroundUserId());

























        return mInjector.binderWithCleanCallingIdentity(() -> {













            int userId = getCurrentForegroundUserId();















            boolean isAffiliated;















            synchronized (getLockObject()) {















                isAffiliated = isUserAffiliatedWithDeviceLocked(userId);









@@ -9370,6 +9370,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













            users.add(UserHandle.of(userId));





























            return users;













        });















    }





























    protected int getProfileParentId(int userHandle) {










@@ -14129,7 +14130,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















    }



























    private boolean isUserAffiliatedWithDeviceLocked(int userId) {













    private boolean isUserAffiliatedWithDeviceLocked(@UserIdInt int userId) {















        if (!mOwners.hasDeviceOwner()) {















            return false;















        }