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

Commit cf16a02e authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Fix access control checks getOwnerInstalledCaCerts" into udc-dev

parents 3d907cca b52f6dae

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

+3 −3
Original line number Diff line number Diff line
@@ -18611,9 +18611,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    public StringParceledListSlice getOwnerInstalledCaCerts(@NonNull UserHandle user) {

        final int userId = user.getIdentifier();

        final CallerIdentity caller = getCallerIdentity();

        Preconditions.checkCallAuthorization((userId == caller.getUserId())

                || isProfileOwner(caller) || isDefaultDeviceOwner(caller)

                || hasFullCrossUsersPermission(caller, userId));

        Preconditions.checkCallAuthorization(

                (isProfileOwner(caller) || isDefaultDeviceOwner(caller) || canQueryAdminPolicy(

                        caller)) && hasFullCrossUsersPermission(caller, userId));















        synchronized (getLockObject()) {















            return new StringParceledListSlice(