diff options
| -rw-r--r-- | core/api/module-lib-current.txt | 2 | ||||
| -rw-r--r-- | core/api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Process.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 27ca6a2794b9..241e5c8d97c4 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -359,8 +359,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 sdkSandboxToAppUid(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 diff --git a/core/api/test-current.txt b/core/api/test-current.txt index c5cce35d988e..abfeae9b285e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1791,9 +1791,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 sdkSandboxToAppUid(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 diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 9428ac965f84..8cb03443528c 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -920,7 +920,7 @@ public class Process { */ @SystemApi(client = MODULE_LIBRARIES) @TestApi - public static final int sdkSandboxToAppUid(int uid) { + public static final int getAppUidForSdkSandboxUid(int uid) { return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID); } diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 6e14203774a1..48ca59dc4c64 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -1890,7 +1890,7 @@ public final class ProcessList { /** Return true if the client app for the SDK sandbox process is debuggable. */ private boolean isAppForSdkSandboxDebuggable(ProcessRecord sandboxProcess) { // TODO (b/221004701) use client app process name - final int appUid = Process.sdkSandboxToAppUid(sandboxProcess.uid); + final int appUid = Process.getAppUidForSdkSandboxUid(sandboxProcess.uid); IPackageManager pm = mService.getPackageManager(); try { String[] packages = pm.getPackagesForUid(appUid); |