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

core/api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -33344,7 +33344,6 @@ 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);
		@@ -33359,7 +33358,6 @@ 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

+2 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,8 @@ 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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2337,7 +2337,9 @@ 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

+11 −11

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ 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;
		@@ -979,8 +978,13 @@ public class Process {
		\|\| (uid >= FIRST_APP_ZYGOTE_ISOLATED_UID && uid <= LAST_APP_ZYGOTE_ISOLATED_UID);
		}

		/** Returns whether the provided UID belongs to an sdk_sandbox process(@see https://developer.android.com/design-for-safety/privacy-sandbox/sdk-runtime). */
		@SuppressLint("UnflaggedApi") // promoting from @SystemApi.
		/**
		* Returns whether the provided UID belongs to a SDK sandbox process.
		*
		* @hide
		*/
		@SystemApi(client = MODULE_LIBRARIES)
		@TestApi
		@android.ravenwood.annotation.RavenwoodKeep
		public static final boolean isSdkSandboxUid(int uid) {
		uid = UserHandle.getAppId(uid);
		@@ -988,19 +992,15 @@ public class Process {
		}

		/**
		* Returns the app uid corresponding to an sdk sandbox uid.
		*
		* @param uid the sdk_sandbox uid
		* @return the app uid for the given sdk_sandbox uid
		* Returns the app process corresponding to an sdk sandbox process.
		*
		* @throws IllegalArgumentException if input is not an SdkSandboxUid
		* @hide
		*/
		@SuppressLint("UnflaggedApi") // promoting from @SystemApi.
		@SystemApi(client = MODULE_LIBRARIES)
		@TestApi
		@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);
		}