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

Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a am: 64b856c601

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838542

Change-Id: Ida3864ef74a50d637c559155c2edc47391267857
This commit is contained in:
TreeHugger Robot
2021-10-01 10:09:34 +00:00
committed by Automerger Merge Worker
parent fb1757f212 64b856c601
commit 6e4f53e93a
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

@@ -3618,6 +3618,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);