Merge "Define SDK_SANDBOX_VIRTUAL_UID" into tm-dev

core/api/test-current.txt

@@ -1801,6 +1801,7 @@ package android.os {
     field public static final int LAST_ISOLATED_UID = 99999; // 0x1869f
     field public static final int NFC_UID = 1027; // 0x403
     field public static final int NUM_UIDS_PER_APP_ZYGOTE = 100; // 0x64
+    field public static final int SDK_SANDBOX_VIRTUAL_UID = 1090; // 0x442
   }
 
   public final class StrictMode {

core/java/android/os/Process.java

@@ -256,6 +256,14 @@ public class Process {
      */
     public static final int UWB_UID = 1083;
 
+    /**
+     * Defines a virtual UID that is used to aggregate data related to SDK sandbox UIDs.
+     * {@see SdkSandboxManager}
+     * @hide
+     */
+    @TestApi
+    public static final int SDK_SANDBOX_VIRTUAL_UID = 1090;
+
     /**
      * GID that corresponds to the INTERNET permission.
      * Must match the value of AID_INET.