Merge "Adds caller check to getAllPackages()" into rvc-qpr-dev

core/java/android/os/Process.java

@@ -206,6 +206,12 @@ public class Process {
      */
     public static final int SE_UID = 1068;
 
+    /**
+     * Defines the UID/GID for the iorapd.
+     * @hide
+     */
+    public static final int IORAPD_UID = 1071;
+
     /**
      * Defines the UID/GID for the NetworkStack app.
      * @hide

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

@@ -6178,6 +6178,10 @@ public class PackageManagerService extends IPackageManager.Stub
 
     @Override
     public List<String> getAllPackages() {
+        // Allow iorapd to call this method.
+        if (Binder.getCallingUid() != Process.IORAPD_UID) {
+            enforceSystemOrRootOrShell("getAllPackages is limited to privileged callers");
+        }
         final int callingUid = Binder.getCallingUid();
         final int callingUserId = UserHandle.getUserId(callingUid);
         synchronized (mLock) {