Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 18e7dedf6c am: 5e3ef6a1ea

am: 4ff24d34d3 Change-Id: If9124acbd9d0c7e123d14a80b245121c27b56d37
2019-04-09 15:17:46 -07:00
parent 5b09928b22 4ff24d34d3
commit 6b830afbad
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -18141,6 +18141,12 @@ 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");
+        }
        if (getInstantAppPackageName(callingUid) != null
                && !isCallerSameApp(packageName, callingUid)) {
            return false;