Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pavel Grafov
2023-04-04 09:08:50 +00:00
committed by Android (Google) Code Review
parent 60a246f6b1 9d90bbc9fd
commit d9fc7a5785
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -2315,7 +2315,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
* Creates a new {@link CallerIdentity} object to represent the caller's identity. * Creates a new {@link CallerIdentity} object to represent the caller's identity.
*/ */
private CallerIdentity getCallerIdentity(@Nullable String callerPackage) { private CallerIdentity getCallerIdentity(@Nullable String callerPackage) {
return getCallerIdentity(null, callerPackage); return getCallerIdentity(null, callerPackage);
} }
@@ -5305,11 +5304,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
Preconditions.checkArgument(allowedModes.contains(passwordComplexity), Preconditions.checkArgument(allowedModes.contains(passwordComplexity),
"Provided complexity is not one of the allowed values."); "Provided complexity is not one of the allowed values.");
CallerIdentity caller; CallerIdentity caller = getCallerIdentity(callerPackageName);
if (isPermissionCheckFlagEnabled()) { if (!isPermissionCheckFlagEnabled()) {
caller = getCallerIdentity(callerPackageName);
} else {
caller = getCallerIdentity();
Preconditions.checkCallAuthorization( Preconditions.checkCallAuthorization(
isDefaultDeviceOwner(caller) || isProfileOwner(caller)); isDefaultDeviceOwner(caller) || isProfileOwner(caller));
Preconditions.checkArgument(!calledOnParent || isProfileOwner(caller)); Preconditions.checkArgument(!calledOnParent || isProfileOwner(caller));