[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b

Change-Id: I172642a771dcafa2d106886984cba3de7a87ae03
2019-04-04 22:24:37 +00:00
parent 26fda93676 70b534799b
commit 49a505f4f9
1 changed files with 7 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -15814,6 +15814,13 @@ public class PackageManagerService extends IPackageManager.Stub {

    @Override
    public boolean isPackageDeviceAdminOnAnyUser(String packageName) {
+        final int callingUid = Binder.getCallingUid();
+        if (checkUidPermission(android.Manifest.permission.MANAGE_USERS, callingUid)
+                != PERMISSION_GRANTED) {
+            EventLog.writeEvent(0x534e4554, "128599183", -1, "");
+            throw new SecurityException(android.Manifest.permission.MANAGE_USERS
+                    + " permission is required to call this API");
+        }
        return isPackageDeviceAdmin(packageName, UserHandle.USER_ALL);
    }