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

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

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

Change-Id: I4c8955cb9cbb19b4245c3156cdedbbe03087b0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mohammed Rashidy
2023-05-19 10:21:05 +00:00
committed by Automerger Merge Worker
parent 2705575056 94a4ffa380
commit e6bf7b8bae
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

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