Merge "Make APIs related to SdkSandbox public" into main (b8917ff0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -33391,6 +33391,7 @@ package android.os {

		public class Process {
		ctor public Process();
		method public static final int getAppUidForSdkSandboxUid(int);
		method public static final long getElapsedCpuTime();
		method public static final int[] getExclusiveCores();
		method public static final int getGidForName(String);
		@@ -33405,6 +33406,7 @@ package android.os {
		method public static final boolean isIsolated();
		method public static final boolean isIsolatedUid(int);
		method public static final boolean isSdkSandbox();
		method public static final boolean isSdkSandboxUid(int);
		method public static final void killProcess(int);
		method public static final int myPid();
		method @NonNull public static String myProcessName();

core/api/module-lib-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -395,8 +395,6 @@ package android.os {
		}

		public class Process {
		method public static final int getAppUidForSdkSandboxUid(int);
		method public static final boolean isSdkSandboxUid(int);
		method public static final int toSdkSandboxUid(int);
		field public static final int NFC_UID = 1027; // 0x403
		field public static final int VPN_UID = 1016; // 0x3f8

core/api/test-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -2343,9 +2343,7 @@ package android.os {
		}

		public class Process {
		method public static final int getAppUidForSdkSandboxUid(int);
		method public static final int getThreadScheduler(int) throws java.lang.IllegalArgumentException;
		method public static final boolean isSdkSandboxUid(int);
		method public static final int toSdkSandboxUid(int);
		field public static final int FIRST_APP_ZYGOTE_ISOLATED_UID = 90000; // 0x15f90
		field public static final int FIRST_ISOLATED_UID = 99000; // 0x182b8

core/java/android/os/Process.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
		import android.annotation.ElapsedRealtimeLong;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UptimeMillisLong;
		@@ -978,12 +979,10 @@ public class Process {
		}

		/**
		* Returns whether the provided UID belongs to a SDK sandbox process.
		*
		* @hide
		* Returns whether the provided UID belongs to an sdk sandbox process
		* @see android.app.sdksandbox.SdkSandboxManager
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		@TestApi
		@SuppressLint("UnflaggedApi") // promoting from @SystemApi.
		@android.ravenwood.annotation.RavenwoodKeep
		public static final boolean isSdkSandboxUid(int uid) {
		uid = UserHandle.getAppId(uid);
		@@ -991,15 +990,20 @@ public class Process {
		}

		/**
		* Returns the app uid corresponding to an sdk sandbox uid.
		* @see android.app.sdksandbox.SdkSandboxManager
		*
		* Returns the app process corresponding to an sdk sandbox process.
		* @param uid the sdk sandbox uid
		* @return the app uid for the given sdk sandbox uid
		*
		* @hide
		* @throws IllegalArgumentException if input is not an sdk sandbox uid
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		@TestApi
		@SuppressLint("UnflaggedApi") // promoting from @SystemApi.
		@android.ravenwood.annotation.RavenwoodKeep
		public static final int getAppUidForSdkSandboxUid(int uid) {
		if (!isSdkSandboxUid(uid)) {
		throw new IllegalArgumentException("Input UID is not an SDK sandbox UID");
		}
		return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID);
		}