Rename SupplementalProcess to SdkSandbox
Bug: 220320098
Test: presubmit
Test: atest PackageManagerShellCommandTest
Test: atest SdkSandboxPermissionTest
Change-Id: I092c72e27be76efcb788cc3af5918f07906e01cb
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java
index 3858963..7736065 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java
@@ -1476,9 +1476,9 @@
}
@Test
- public void testQuerySupplementalProcessPackageName() throws Exception {
+ public void testQuerySdkSandboxPackageName() throws Exception {
final PackageManager pm = getPackageManager();
- final String name = pm.getSupplementalProcessPackageName();
+ final String name = pm.getSdkSandboxPackageName();
assertNotNull(name);
final ApplicationInfo info = pm.getApplicationInfo(
name, PackageManager.ApplicationInfoFlags.of(PackageManager.MATCH_SYSTEM_ONLY));
@@ -1487,27 +1487,27 @@
}
@Test
- public void testGetPackagesForUid_supplementalProcessUid() throws Exception {
+ public void testGetPackagesForUid_sdkSandboxUid() throws Exception {
final PackageManager pm = getPackageManager();
- final String[] pkgs = pm.getPackagesForUid(Process.toSupplementalUid(10239));
+ final String[] pkgs = pm.getPackagesForUid(Process.toSdkSandboxUid(10239));
assertEquals(1, pkgs.length);
- assertEquals(pm.getSupplementalProcessPackageName(), pkgs[0]);
+ assertEquals(pm.getSdkSandboxPackageName(), pkgs[0]);
}
@Test
- public void testGetNameForUid_supplementalProcessUid() throws Exception {
+ public void testGetNameForUid_sdkSandboxUid() throws Exception {
final PackageManager pm = getPackageManager();
- final String pkgName = pm.getNameForUid(Process.toSupplementalUid(11543));
- assertEquals(pm.getSupplementalProcessPackageName(), pkgName);
+ final String pkgName = pm.getNameForUid(Process.toSdkSandboxUid(11543));
+ assertEquals(pm.getSdkSandboxPackageName(), pkgName);
}
@Test
- public void testGetNamesForUids_supplementalProcessUids() throws Exception {
+ public void testGetNamesForUids_sdkSandboxUids() throws Exception {
final PackageManager pm = getPackageManager();
- final int[] uids = new int[]{Process.toSupplementalUid(10101)};
+ final int[] uids = new int[]{Process.toSdkSandboxUid(10101)};
final String[] names = pm.getNamesForUids(uids);
assertEquals(1, names.length);
- assertEquals(pm.getSupplementalProcessPackageName(), names[0]);
+ assertEquals(pm.getSdkSandboxPackageName(), names[0]);
}
private static class FullyRemovedBroadcastReceiver extends BroadcastReceiver {
diff --git a/tests/tests/permission/src/android/permission/cts/SupplementalProcessPermissionTest.java b/tests/tests/permission/src/android/permission/cts/SdkSandboxPermissionTest.java
similarity index 83%
rename from tests/tests/permission/src/android/permission/cts/SupplementalProcessPermissionTest.java
rename to tests/tests/permission/src/android/permission/cts/SdkSandboxPermissionTest.java
index 6f79045..88fcaec 100644
--- a/tests/tests/permission/src/android/permission/cts/SupplementalProcessPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/SdkSandboxPermissionTest.java
@@ -34,31 +34,31 @@
import org.junit.runner.RunWith;
/**
- * Tests for permission handling for supplemental process uid range.
+ * Tests for permission handling for sdk sandbox uid range.
*/
@AppModeFull(reason = "Instant apps can't access PermissionManager")
@RunWith(AndroidJUnit4ClassRunner.class)
-public class SupplementalProcessPermissionTest {
+public class SdkSandboxPermissionTest {
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
- public void testSupplementalProcessHasInternetPermission() throws Exception {
+ public void testSdkSandboxHasInternetPermission() throws Exception {
final Context ctx = getInstrumentation().getContext();
int ret = ctx.checkPermission(
Manifest.permission.INTERNET,
/* pid= */ -1 /* invalid pid */,
- Process.toSupplementalUid(19999));
+ Process.toSdkSandboxUid(19999));
assertThat(ret).isEqualTo(PackageManager.PERMISSION_GRANTED);
}
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
- public void testSupplementalProcessDoesNotHaveFineLocationPermission() throws Exception {
+ public void testSdkSandboxDoesNotHaveFineLocationPermission() throws Exception {
final Context ctx = getInstrumentation().getContext();
int ret = ctx.checkPermission(
Manifest.permission.ACCESS_FINE_LOCATION,
/* pid= */ -1 /* invalid pid */,
- Process.toSupplementalUid(19999));
+ Process.toSdkSandboxUid(19999));
assertThat(ret).isEqualTo(PackageManager.PERMISSION_DENIED);
}
}
