commit 1993b95b3119fcb9558895a0e81a711023c7f559
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 25 22:59:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 25 22:59:32 2019 +0000
tree b8d28a7c7594f1f00b2a629f5015eaeea059e340
parent f89753c6c13cecc2641524b8f455a9f73100bb4d
parent 569ac173c18b6b63c5e543f585796929435a0eac

Merge "Added missing permission check to isPackageDeviceAdminOnAnyUser."

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 10c30e3..1a33b16 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -17800,6 +17800,12 @@
     @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;