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

Commit ea1510d6 authored by Sandro Montanari's avatar Sandro Montanari Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Change position of isSdkSandbox{Audit,Next} inpu..."" into main

parents fc401764 5498ea50

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

+9 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static android.os.Process.startWebView; 
import static android.system.OsConstants.EAGAIN;



import static com.android.sdksandbox.flags.Flags.selinuxSdkSandboxAudit;

import static com.android.sdksandbox.flags.Flags.selinuxSdkSandboxInputSelector;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LRU;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_NETWORK;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESSES;
@@ -2066,10 +2067,15 @@ public final class ProcessList { 
            }

        }



        // The order of selectors in seInfo matters, the string is terminated by the word complete.

        if (selinuxSdkSandboxInputSelector()) {

            return app.info.seInfo + extraInfo + TextUtils.emptyIfNull(app.info.seInfoUser);

        } else {

            return app.info.seInfo

                + (TextUtils.isEmpty(app.info.seInfoUser) ? "" : app.info.seInfoUser) + extraInfo;

                    + (TextUtils.isEmpty(app.info.seInfoUser) ? "" : app.info.seInfoUser)

                    + extraInfo;

        }

    }





    @GuardedBy("mService")

    boolean startProcessLocked(HostingRecord hostingRecord, String entryPoint, ProcessRecord app,