Merge "Fix installKeyPair cred mng app access control" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8504b29989
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user