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

Commit d9fc7a57 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Ensure correct admin name is logged." into udc-dev

parents 60a246f6 9d90bbc9

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

+2 −6
Original line number Diff line number Diff line
@@ -2315,7 +2315,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
     * Creates a new {@link CallerIdentity} object to represent the caller's identity.

     */

    private CallerIdentity getCallerIdentity(@Nullable String callerPackage) {















        return getCallerIdentity(null, callerPackage);















    }
























@@ -5305,11 +5304,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        Preconditions.checkArgument(allowedModes.contains(passwordComplexity),















                "Provided complexity is not one of the allowed values.");



























        CallerIdentity caller;













        if (isPermissionCheckFlagEnabled()) {













            caller = getCallerIdentity(callerPackageName);













        } else {













            caller = getCallerIdentity();













        CallerIdentity caller = getCallerIdentity(callerPackageName);













        if (!isPermissionCheckFlagEnabled()) {















            Preconditions.checkCallAuthorization(















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















            Preconditions.checkArgument(!calledOnParent || isProfileOwner(caller));