Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a41f98 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Revert "CACert Framework UID changes"" into aosp-24Q3-ts-dev

parents 4848ffd8 980eb07f

core/java/android/os/Process.java

+0 −7
Original line number Diff line number Diff line
@@ -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;

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

+0 −3
Original line number Diff line number Diff line
@@ -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");