From 0d81df94cd2c33fece92d63fa313158d61349225 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Sun, 20 Jan 2019 12:23:32 +0900
Subject: [PATCH] Expose UIDs for NetworkStack permission checks

The UIDs are unlikely to change and added as public API.

Test: m
Bug: 112869080
Change-Id: I5477093a4c8593dd9ada7587b86c65352e628c34
---
 api/current.txt                   | 3 +++
 config/hiddenapi-greylist.txt     | 3 ---
 core/java/android/os/Process.java | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index bd769e09dec3..5e9100a3c352 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -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
diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt
index 2bd813e14937..afb250a98e06 100644
--- a/config/hiddenapi-greylist.txt
+++ b/config/hiddenapi-greylist.txt
@@ -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
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 0040825917e4..8254c534c7df 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -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;
 
-- 
2.11.0