From 251176e7748794928132121ac4f4390a55f34320 Mon Sep 17 00:00:00 2001
From: Ayush Sharma <ayushsha@google.com>
Date: Mon, 13 Sep 2021 14:27:52 +0000
Subject: [PATCH] Add missing check in hasGrantedPolicy

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

Bug: 192247339
Test: NA

Change-Id: I6f821d039a6dfd70fb005165af2c5cb13ad3de9b
Merged-In: I6f821d039a6dfd70fb005165af2c5cb13ad3de9b
(cherry picked from commit c7abd726dd508e327073df0293fcf9084c7004f0)
---
 .../server/devicepolicy/DevicePolicyManagerService.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 193d92a3b2ff9..dca12245a6c20 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3599,6 +3599,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
 
         final CallerIdentity caller = getCallerIdentity();
         Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));
+        Preconditions.checkCallAuthorization(
+                isCallingFromPackage(adminReceiver.getPackageName(), caller.getUid())
+                        || isSystemUid(caller));
 
         synchronized (getLockObject()) {
             ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle);