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

Commit e292f80b authored May 19, 2023 by Mohammed Rashidy Committed by Automerger Merge Worker May 19, 2023

Merge "Starting sandbox activity should not start a new sandbox process" into...

Merge "Starting sandbox activity should not start a new sandbox process" into udc-dev am: 94a4ffa3 am: e6bf7b8b

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

Change-Id: I5c7729f92b960f046db1a493a6878bf16fa5e827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 51c7ac44 e6bf7b8b

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3182,6 +3182,10 @@ public final class ProcessList {
	if (isSdkSandbox) {		if (isSdkSandbox) {
	uid = sdkSandboxUid;		uid = sdkSandboxUid;
	}		}
			if (Process.isSdkSandboxUid(uid) && (!isSdkSandbox \|\| sdkSandboxClientAppPackage == null)) {
			Slog.e(TAG, "Abort creating new sandbox process as required parameters are missing.");
			return null;
			}
	if (isolated) {		if (isolated) {
	if (isolatedUid == 0) {		if (isolatedUid == 0) {
	IsolatedUidRange uidRange = getOrCreateIsolatedUidRangeLocked(info, hostingRecord);		IsolatedUidRange uidRange = getOrCreateIsolatedUidRangeLocked(info, hostingRecord);

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1074,6 +1074,12 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
	// Remove the process record so it won't be considered as alive.		// Remove the process record so it won't be considered as alive.
	mService.mProcessNames.remove(wpc.mName, wpc.mUid);		mService.mProcessNames.remove(wpc.mName, wpc.mUid);
	mService.mProcessMap.remove(wpc.getPid());		mService.mProcessMap.remove(wpc.getPid());
			} else if (r.intent.isSandboxActivity(mService.mContext)) {
			Slog.e(TAG, "Abort sandbox activity launching as no sandbox process to host it.");
			r.finishIfPossible("No sandbox process for the activity", false /* oomAdj */);
			r.launchFailed = true;
			r.detachFromProcess();
			return;
	}		}

	r.notifyUnknownVisibilityLaunchedForKeyguardTransition();		r.notifyUnknownVisibilityLaunchedForKeyguardTransition();