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

Commit 94a4ffa3 authored by Mohammed Rashidy's avatar Mohammed Rashidy Committed by Android (Google) Code Review
Browse files

Merge "Starting sandbox activity should not start a new sandbox process" into udc-dev

parents f82b9468 337a29bf

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

+4 −0
Original line number Diff line number Diff line
@@ -3182,6 +3182,10 @@ public final class ProcessList { 
        if (isSdkSandbox) {

            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 (isolatedUid == 0) {

                IsolatedUidRange uidRange = getOrCreateIsolatedUidRangeLocked(info, hostingRecord);

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

+6 −0
Original line number 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.

            mService.mProcessNames.remove(wpc.mName, wpc.mUid);

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