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

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

Merge "Rename sdkSandboxToAppUid to getAppUidForSdkSandboxUid" into tm-dev am: 25778aaf 

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

Change-Id: I12e4867b1847390984c13b73e22b6d425d0b17c2
parents 8869ce6e 25778aaf

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/os/Process.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -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);