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

Add missing check in hasGrantedPolicy

Browse Source 
Add check that if component name is specified, it belong to the caller.

Bug: 192247339
Test: NA

Change-Id: I6f821d039a6dfd70fb005165af2c5cb13ad3de9b
This commit is contained in:
Ayush Sharma
2021-09-13 14:27:52 +00:00
parent 12f914e3f6
commit c7abd726dd
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3624,6 +3624,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final CallerIdentity caller = getCallerIdentity(); final CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle)); Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));
Preconditions.checkCallAuthorization(
isCallingFromPackage(adminReceiver.getPackageName(), caller.getUid())
|| isSystemUid(caller));
synchronized (getLockObject()) { synchronized (getLockObject()) {
ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle); ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle);