From 980eb07f5bf18b62e7bc4504b25e4a19c19d58ff Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Fri, 30 Aug 2024 00:43:08 +0000 Subject: DO NOT MERGE Revert "CACert Framework UID changes" This reverts commit 213372217fd10bef44db1e70b323805a3ca00b54. Reason for revert: ag/28817258 is the proper fix Change-Id: I1c52b37b43f2860caba8ea791b7efafd573cc5ea --- core/java/android/os/Process.java | 7 ------- .../core/java/com/android/server/pm/PackageManagerService.java | 3 --- 2 files changed, 10 deletions(-) diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 5f790a921415..db06a6ba0ef5 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -274,13 +274,6 @@ public class Process { */ 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; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index df47f0836440..c0b8034b9a56 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -371,7 +371,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 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; @@ -2053,8 +2052,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 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"); -- cgit v1.2.3-59-g8ed1b