commit 213372217fd10bef44db1e70b323805a3ca00b54
author Manoj Basapathi <quic_manojbm@quicinc.com> Thu Jul 25 07:15:01 2024 +0000
committer Hung-ying Tyan <tyanh@google.com> Thu Jul 25 07:22:24 2024 +0000
tree 77350b8af45f52a959e383dd3c1fdc7028671c91
parent cd6318bd0bdd79762095dc541d613b963b59d8b0

RESTRICT AUTOMERGE CACert Framework UID changes

- Added new vendor UID under OEM uid range to register
AIDL service from vendor JAVA apk domain.

Bug: 350847330
Test: TH
Signed-off-by: Manoj Basapathi <quic_manojbm@quicinc.com>
(cherry picked from https://android-review.googlesource.com/q/commit:df5036a8bdc66ece844900ee26f38f6059d71046)
Merged-In: I1279a47ee214cd9415b59ee867ff71e56b1db076
Change-Id: I1279a47ee214cd9415b59ee867ff71e56b1db076

core/java/android/os/Process.java

diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index db06a6b..5f790a9 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -274,6 +274,13 @@
      */
     public static final int INET_GID = 3003;
 
+    /**
+     * Defines the UID/GID for the vendor based data process.
+     * This is used to register AIDL service from vendor app context.
+     * @hide
+     */
+    public static final int VENDOR_DATA_UID = 2918;
+
     /** {@hide} */
     public static final int NOBODY_UID = 9999;
 

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 c0b8034..df47f08 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -371,6 +371,7 @@
     private static final int SE_UID = Process.SE_UID;
     private static final int NETWORKSTACK_UID = Process.NETWORK_STACK_UID;
     private static final int UWB_UID = Process.UWB_UID;
+    private static final int VENDOR_DATA_UID = Process.VENDOR_DATA_UID;
 
     static final int SCAN_NO_DEX = 1 << 0;
     static final int SCAN_UPDATE_SIGNATURE = 1 << 1;
@@ -2052,6 +2053,8 @@
                 ApplicationInfo.FLAG_SYSTEM, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED);
         mSettings.addSharedUserLPw("android.uid.uwb", UWB_UID,
                 ApplicationInfo.FLAG_SYSTEM, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED);
+        mSettings.addSharedUserLPw("android.uid.vendordata", VENDOR_DATA_UID,
+                ApplicationInfo.PRIVATE_FLAG_VENDOR, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED);
         t.traceEnd();
 
         String separateProcesses = SystemProperties.get("debug.separate_processes");