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

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

Browse Source
This commit is contained in:
Alex Johnston
2023-02-20 12:04:53 +00:00
committed by Android (Google) Code Review
parent 3d907cca3c b52f6dae99
commit cf16a02e27
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(