summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ApplicationPackageManager.java4
-rw-r--r--core/java/android/app/SystemServiceRegistry.java4
-rw-r--r--core/java/android/content/pm/IPackageManager.aidl2
-rw-r--r--core/java/android/content/pm/PackageManager.java6
-rw-r--r--core/java/android/os/Environment.java3
-rw-r--r--core/java/android/os/Process.java36
6 files changed, 27 insertions, 28 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 20ffa254a9bf..bda2e459f52a 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -867,9 +867,9 @@ public class ApplicationPackageManager extends PackageManager {
* @hide
*/
@Override
- public String getSupplementalProcessPackageName() {
+ public String getSdkSandboxPackageName() {
try {
- return mPM.getSupplementalProcessPackageName();
+ return mPM.getSdkSandboxPackageName();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index eeb4705fc7d3..ddce29da8e00 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -36,6 +36,7 @@ import android.app.job.JobSchedulerFrameworkInitializer;
import android.app.people.PeopleManager;
import android.app.prediction.AppPredictionManager;
import android.app.role.RoleFrameworkInitializer;
+import android.app.sdksandbox.SdkSandboxManagerFrameworkInitializer;
import android.app.search.SearchUiManager;
import android.app.slice.SliceManager;
import android.app.smartspace.SmartspaceManager;
@@ -208,7 +209,6 @@ import android.service.oemlock.OemLockManager;
import android.service.persistentdata.IPersistentDataBlockService;
import android.service.persistentdata.PersistentDataBlockManager;
import android.service.vr.IVrManager;
-import android.supplementalprocess.SupplementalProcessFrameworkInitializer;
import android.telecom.TelecomManager;
import android.telephony.MmsManager;
import android.telephony.TelephonyFrameworkInitializer;
@@ -1564,7 +1564,7 @@ public final class SystemServiceRegistry {
MediaFrameworkInitializer.registerServiceWrappers();
RoleFrameworkInitializer.registerServiceWrappers();
SchedulingFrameworkInitializer.registerServiceWrappers();
- SupplementalProcessFrameworkInitializer.registerServiceWrappers();
+ SdkSandboxManagerFrameworkInitializer.registerServiceWrappers();
UwbFrameworkInitializer.registerServiceWrappers();
SafetyCenterFrameworkInitializer.registerServiceWrappers();
ConnectivityFrameworkInitializerTiramisu.registerServiceWrappers();
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 30aed8bc4de7..e9e6cd3a54c5 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -653,7 +653,7 @@ interface IPackageManager {
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
String getPermissionControllerPackageName();
- String getSupplementalProcessPackageName();
+ String getSdkSandboxPackageName();
ParceledListSlice getInstantApps(int userId);
byte[] getInstantAppCookie(String packageName, int userId);
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index a162c41e095e..f4bc1616da2b 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -5772,16 +5772,16 @@ public abstract class PackageManager {
}
/**
- * Returns the package name of the component implementing supplemental process service.
+ * Returns the package name of the component implementing sdk sandbox service.
*
- * @return the package name of the component implementing supplemental process service
+ * @return the package name of the component implementing sdk sandbox service
*
* @hide
*/
@NonNull
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@TestApi
- public String getSupplementalProcessPackageName() {
+ public String getSdkSandboxPackageName() {
throw new RuntimeException("Not implemented. Must override in a subclass.");
}
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 3d129417e53b..79fa4fbe0447 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -29,7 +29,6 @@ import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
-import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.storage.StorageManager;
@@ -1333,7 +1332,7 @@ public class Environment {
final Context context = AppGlobals.getInitialApplication();
final int uid = context.getApplicationInfo().uid;
// Isolated processes and Instant apps are never allowed to be in scoped storage
- if (Process.isIsolated(uid) || Process.isSupplemental(uid)) {
+ if (Process.isIsolated(uid) || Process.isSdkSandboxUid(uid)) {
return false;
}
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 17b5ec5ca01b..f069158c9242 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -281,23 +281,23 @@ public class Process {
/**
* Defines the start of a range of UIDs going from this number to
- * {@link #LAST_SUPPLEMENTAL_UID} that are reserved for assigning to
- * supplemental processes. There is a 1-1 mapping between a supplemental
+ * {@link #LAST_SDK_SANDBOX_UID} that are reserved for assigning to
+ * sdk sandbox processes. There is a 1-1 mapping between a sdk sandbox
* process UID and the app that it belongs to, which can be computed by
- * subtracting (FIRST_SUPPLEMENTAL_UID - FIRST_APPLICATION_UID) from the
- * uid of a supplemental process.
+ * subtracting (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID) from the
+ * uid of a sdk sandbox process.
*
* Note that there are no GIDs associated with these processes; storage
* attribution for them will be done using project IDs.
* @hide
*/
- public static final int FIRST_SUPPLEMENTAL_UID = 20000;
+ public static final int FIRST_SDK_SANDBOX_UID = 20000;
/**
- * Last UID that is used for supplemental processes.
+ * Last UID that is used for sdk sandbox processes.
* @hide
*/
- public static final int LAST_SUPPLEMENTAL_UID = 29999;
+ public static final int LAST_SDK_SANDBOX_UID = 29999;
/**
* First uid used for fully isolated sandboxed processes spawned from an app zygote
@@ -901,44 +901,44 @@ public class Process {
}
/**
- * Returns whether the provided UID belongs to a supplemental process.
+ * Returns whether the provided UID belongs to a SDK sandbox process.
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- public static final boolean isSupplemental(int uid) {
+ public static final boolean isSdkSandboxUid(int uid) {
uid = UserHandle.getAppId(uid);
- return (uid >= FIRST_SUPPLEMENTAL_UID && uid <= LAST_SUPPLEMENTAL_UID);
+ return (uid >= FIRST_SDK_SANDBOX_UID && uid <= LAST_SDK_SANDBOX_UID);
}
/**
*
- * Returns the app process corresponding to a supplemental process.
+ * Returns the app process corresponding to a sdk sandbox process.
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
public static final int toAppUid(int uid) {
- return uid - (FIRST_SUPPLEMENTAL_UID - FIRST_APPLICATION_UID);
+ return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID);
}
/**
*
- * Returns the supplemental process corresponding to an app process.
+ * Returns the sdk sandbox process corresponding to an app process.
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
@TestApi
- public static final int toSupplementalUid(int uid) {
- return uid + (FIRST_SUPPLEMENTAL_UID - FIRST_APPLICATION_UID);
+ public static final int toSdkSandboxUid(int uid) {
+ return uid + (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID);
}
/**
- * Returns whether the current process is a supplemental process.
+ * Returns whether the current process is a sdk sandbox process.
*/
- public static final boolean isSupplemental() {
- return isSupplemental(myUid());
+ public static final boolean isSdkSandbox() {
+ return isSdkSandboxUid(myUid());
}
/**
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 19:00:54 +0000