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

Commit 56c39376 authored Mar 08, 2022 by Gavin Corkery Committed by Automerger Merge Worker Mar 08, 2022

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: Iab70b3c31f084726f0a536a12653f169b704de47

parents 1cd717a2 25778aaf

core/api/module-lib-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -359,8 +359,8 @@ package android.os {
	}		}

	public class Process {		public class Process {
			method public static final int getAppUidForSdkSandboxUid(int);
	method public static final boolean isSdkSandboxUid(int);		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 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

core/api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1791,9 +1791,9 @@ package android.os {
	}		}

	public class Process {		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 int getThreadScheduler(int) throws java.lang.IllegalArgumentException;
	method public static final boolean isSdkSandboxUid(int);		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

core/java/android/os/Process.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -920,7 +920,7 @@ public class Process {
	*/		*/
	@SystemApi(client = MODULE_LIBRARIES)		@SystemApi(client = MODULE_LIBRARIES)
	@TestApi		@TestApi
	public static final int sdkSandboxToAppUid(int uid) {		public static final int getAppUidForSdkSandboxUid(int uid) {
	return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID);		return uid - (FIRST_SDK_SANDBOX_UID - FIRST_APPLICATION_UID);
	}		}

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

+1 −1

Original line number	Original line	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. */		/** 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.sdkSandboxToAppUid(sandboxProcess.uid);		final int appUid = Process.getAppUidForSdkSandboxUid(sandboxProcess.uid);
	IPackageManager pm = mService.getPackageManager();		IPackageManager pm = mService.getPackageManager();
	try {		try {
	String[] packages = pm.getPackagesForUid(appUid);		String[] packages = pm.getPackagesForUid(appUid);