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

Commit 8504b299 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix installKeyPair cred mng app access control" into sc-dev

parents 6bc439fa 06abbc7d

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

+1 −1
Original line number Diff line number Diff line
@@ -5459,7 +5459,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                && (isProfileOwner(caller) || isDeviceOwner(caller)))

                || (caller.hasPackage() && (isCallerDelegate || isCredentialManagementApp)));

        if (isCredentialManagementApp) {

            Preconditions.checkCallAuthorization(isUserSelectable, "The credential "

            Preconditions.checkCallAuthorization(!isUserSelectable, "The credential "

                    + "management app is not allowed to install a user selectable key pair");

            Preconditions.checkCallAuthorization(

                    isAliasInCredentialManagementAppPolicy(caller, alias),