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

Commit 3b887bdf authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Expose UIDs for NetworkStack permission checks"

parents 06adb08d 0d81df94

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -33292,10 +33292,13 @@ package android.os { 
    method public static final void setThreadPriority(int, int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;

    method public static final void setThreadPriority(int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;

    method @Deprecated public static final boolean supportsProcesses();

    field public static final int BLUETOOTH_UID = 1002; // 0x3ea

    field public static final int FIRST_APPLICATION_UID = 10000; // 0x2710

    field public static final int INVALID_UID = -1; // 0xffffffff

    field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f

    field public static final int PHONE_UID = 1001; // 0x3e9

    field public static final int ROOT_UID = 0; // 0x0

    field public static final int SHELL_UID = 2000; // 0x7d0

    field public static final int SIGNAL_KILL = 9; // 0x9

    field public static final int SIGNAL_QUIT = 3; // 0x3

    field public static final int SIGNAL_USR1 = 10; // 0xa

config/hiddenapi-greylist.txt

+0 −3
Original line number Diff line number Diff line
@@ -985,7 +985,6 @@ Landroid/os/PowerManager;->mService:Landroid/os/IPowerManager; 
Landroid/os/PowerManager;->setPowerSaveMode(Z)Z

Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V

Landroid/os/PowerManager;->wakeUp(JLjava/lang/String;)V

Landroid/os/Process;->BLUETOOTH_UID:I

Landroid/os/Process;->DRM_UID:I

Landroid/os/Process;->getFreeMemory()J

Landroid/os/Process;->getParentPid(I)I
@@ -1012,10 +1011,8 @@ Landroid/os/Process;->PROC_TERM_MASK:I 
Landroid/os/Process;->PROC_ZERO_TERM:I

Landroid/os/Process;->readProcFile(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z

Landroid/os/Process;->readProcLines(Ljava/lang/String;[Ljava/lang/String;[J)V

Landroid/os/Process;->ROOT_UID:I

Landroid/os/Process;->setArgV0(Ljava/lang/String;)V

Landroid/os/Process;->setProcessGroup(II)V

Landroid/os/Process;->SHELL_UID:I

Landroid/os/Process;->VPN_UID:I

Landroid/os/Process;->WIFI_UID:I

Landroid/os/RecoverySystem;->verifyPackageCompatibility(Ljava/io/InputStream;)Z

core/java/android/os/Process.java

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ public class Process { 


    /**

     * Defines the root UID.

     * @hide

     */

    public static final int ROOT_UID = 0;
@@ -62,7 +61,6 @@ public class Process { 


    /**

     * Defines the UID/GID for the user shell.

     * @hide

     */

    public static final int SHELL_UID = 2000;
@@ -116,7 +114,6 @@ public class Process { 


    /**

     * Defines the UID/GID for the Bluetooth service process.

     * @hide

     */

    public static final int BLUETOOTH_UID = 1002;