Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add some Process APIs to test_current" into tm-dev

Browse Source
This commit is contained in:
Gavin Corkery
2022-03-03 20:57:51 +00:00
committed by Android (Google) Code Review
parent 23e2cc15da b9c52eb96c
commit 0214bd512e
4 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/module-lib-current.txt
View File

@@ -364,7 +364,7 @@ package android.os {
public class Process { public class Process {
method public static final boolean isSdkSandboxUid(int); method public static final boolean isSdkSandboxUid(int);
method public static final int toAppUid(int); method public static final int sdkSandboxToAppUid(int);
method public static final int toSdkSandboxUid(int); method public static final int toSdkSandboxUid(int);
field public static final int NFC_UID = 1027; // 0x403 field public static final int NFC_UID = 1027; // 0x403
field public static final int VPN_UID = 1016; // 0x3f8 field public static final int VPN_UID = 1016; // 0x3f8

2
core/api/test-current.txt
View File

@@ -1778,6 +1778,8 @@ package android.os {
public class Process { public class Process {
method public static final int getThreadScheduler(int) throws java.lang.IllegalArgumentException; 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); 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_APP_ZYGOTE_ISOLATED_UID = 90000; // 0x15f90
field public static final int FIRST_ISOLATED_UID = 99000; // 0x182b8 field public static final int FIRST_ISOLATED_UID = 99000; // 0x182b8

6
core/java/android/os/Process.java
View File

@@ -906,6 +906,7 @@ public class Process {
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES) @SystemApi(client = MODULE_LIBRARIES)
@TestApi
public static final boolean isSdkSandboxUid(int uid) { public static final boolean isSdkSandboxUid(int uid) {
uid = UserHandle.getAppId(uid); uid = UserHandle.getAppId(uid);
return (uid >= FIRST_SDK_SANDBOX_UID && uid <= LAST_SDK_SANDBOX_UID); return (uid >= FIRST_SDK_SANDBOX_UID && uid <= LAST_SDK_SANDBOX_UID);
@@ -913,12 +914,13 @@ public class Process {
/** /**
* *
* Returns the app process corresponding to a sdk sandbox process. * Returns the app process corresponding to an sdk sandbox process.
* *
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES) @SystemApi(client = MODULE_LIBRARIES)
public static final int toAppUid(int uid) { @TestApi
public static final int sdkSandboxToAppUid(int uid) {
return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID); return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID);
} }

2
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -1893,7 +1893,7 @@ public final class ProcessList {
/** Return true if the client app for the SDK sandbox process is debuggable. */ /** Return true if the client app for the SDK sandbox process is debuggable. */
private boolean isAppForSdkSandboxDebuggable(ProcessRecord sandboxProcess) { private boolean isAppForSdkSandboxDebuggable(ProcessRecord sandboxProcess) {
// TODO (b/221004701) use client app process name // TODO (b/221004701) use client app process name
final int appUid = Process.toAppUid(sandboxProcess.uid); final int appUid = Process.sdkSandboxToAppUid(sandboxProcess.uid);
IPackageManager pm = mService.getPackageManager(); IPackageManager pm = mService.getPackageManager();
try { try {
String[] packages = pm.getPackagesForUid(appUid); String[] packages = pm.getPackagesForUid(appUid);