diff options
| author | 2024-05-20 19:58:40 +0000 | |
|---|---|---|
| committer | 2024-05-20 19:58:40 +0000 | |
| commit | eea2a1016b89fed9b0f70b5181e2490c03f858e8 (patch) | |
| tree | d82a219671ad057ebdf642f0b0147e0f8789bd07 | |
| parent | 2229b0d926e8f38e163a89b4078e9aec1d66bcad (diff) | |
| parent | 4fd29b7eefd13eb78c9c5ba1d99bf1d0c697df33 (diff) | |
Merge "Revert "Change position of isSdkSandbox{Audit,Next} input selectors"" into main
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index a5449a0f0431..6779f7a37f20 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -37,7 +37,6 @@ 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,15 +2065,11 @@ public final class ProcessList { } } - 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; - } + return app.info.seInfo + + (TextUtils.isEmpty(app.info.seInfoUser) ? "" : app.info.seInfoUser) + extraInfo; } + @GuardedBy("mService") boolean startProcessLocked(HostingRecord hostingRecord, String entryPoint, ProcessRecord app, int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags, int mountExternal, |