Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose UIDs for NetworkStack permission checks"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-01-22 13:40:57 +00:00
committed by Gerrit Code Review
parent 06adb08d27 0d81df94cd
commit 3b887bdf4a
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -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, int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;
method public static final void setThreadPriority(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(); 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 FIRST_APPLICATION_UID = 10000; // 0x2710
field public static final int INVALID_UID = -1; // 0xffffffff field public static final int INVALID_UID = -1; // 0xffffffff
field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f
field public static final int PHONE_UID = 1001; // 0x3e9 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_KILL = 9; // 0x9
field public static final int SIGNAL_QUIT = 3; // 0x3 field public static final int SIGNAL_QUIT = 3; // 0x3
field public static final int SIGNAL_USR1 = 10; // 0xa field public static final int SIGNAL_USR1 = 10; // 0xa

3
config/hiddenapi-greylist.txt
View File

@@ -985,7 +985,6 @@ Landroid/os/PowerManager;->mService:Landroid/os/IPowerManager;
Landroid/os/PowerManager;->setPowerSaveMode(Z)Z Landroid/os/PowerManager;->setPowerSaveMode(Z)Z
Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V
Landroid/os/PowerManager;->wakeUp(JLjava/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;->DRM_UID:I
Landroid/os/Process;->getFreeMemory()J Landroid/os/Process;->getFreeMemory()J
Landroid/os/Process;->getParentPid(I)I 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;->PROC_ZERO_TERM:I
Landroid/os/Process;->readProcFile(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z 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;->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;->setArgV0(Ljava/lang/String;)V
Landroid/os/Process;->setProcessGroup(II)V Landroid/os/Process;->setProcessGroup(II)V
Landroid/os/Process;->SHELL_UID:I
Landroid/os/Process;->VPN_UID:I Landroid/os/Process;->VPN_UID:I
Landroid/os/Process;->WIFI_UID:I Landroid/os/Process;->WIFI_UID:I
Landroid/os/RecoverySystem;->verifyPackageCompatibility(Ljava/io/InputStream;)Z Landroid/os/RecoverySystem;->verifyPackageCompatibility(Ljava/io/InputStream;)Z

3
core/java/android/os/Process.java
View File

@@ -46,7 +46,6 @@ public class Process {
/** /**
* Defines the root UID. * Defines the root UID.
* @hide
*/ */
public static final int ROOT_UID = 0; public static final int ROOT_UID = 0;
@@ -62,7 +61,6 @@ public class Process {
/** /**
* Defines the UID/GID for the user shell. * Defines the UID/GID for the user shell.
* @hide
*/ */
public static final int SHELL_UID = 2000; public static final int SHELL_UID = 2000;
@@ -116,7 +114,6 @@ public class Process {
/** /**
* Defines the UID/GID for the Bluetooth service process. * Defines the UID/GID for the Bluetooth service process.
* @hide
*/ */
public static final int BLUETOOTH_UID = 1002; public static final int BLUETOOTH_UID = 1002;