Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cca60845 authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

Merge "Add some Process APIs to test_current" into tm-dev am: 0214bd51 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943884

Change-Id: I67a131e62718f1b833f845b8f1eec157891e5090
parents 85fabaca 0214bd51

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ package android.os { 


  public class Process {

    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);

    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
@@ -1778,6 +1778,8 @@ package android.os { 


  public class Process {

    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

core/java/android/os/Process.java

+39 −37
Original line number Diff line number Diff line
@@ -906,6 +906,7 @@ public class Process { 
     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @TestApi

    public static final boolean isSdkSandboxUid(int uid) {

        uid = UserHandle.getAppId(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

     */

    @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);

    }

services/core/java/com/android/server/am/ProcessList.java

+1 −1
Original line number Diff line number Diff line
@@ -1893,7 +1893,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.toAppUid(sandboxProcess.uid);

        final int appUid = Process.sdkSandboxToAppUid(sandboxProcess.uid);

        IPackageManager pm = mService.getPackageManager();

        try {

            String[] packages = pm.getPackagesForUid(appUid);