diff options
| author | 2024-05-21 08:55:54 +0000 | |
|---|---|---|
| committer | 2024-05-24 08:50:57 +0000 | |
| commit | 5498ea50ac3f47299d84379350ff3a39e429be0b (patch) | |
| tree | e36024dcb5b7f14bfcd70df45ec9b36d5dddb1a1 | |
| parent | 91c55edef3ca4f3722cac366a972d821b96e3d1a (diff) | |
Revert "Revert "Change position of isSdkSandbox{Audit,Next} inpu..."
Revert submission 27422063-revert-27360739-sdk_sandbox_audit-YEGDIAPRVM
Reason for revert: fixed the broken test_mapping
Reverted changes: /q/submissionid:27422063-revert-27360739-sdk_sandbox_audit-YEGDIAPRVM
Change-Id: Id54b037c36c299ba50e5fe4f33aa69404117e69e
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 6779f7a37f20..f0ec44f0b835 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -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; @@ -2065,11 +2066,16 @@ public final class ProcessList { } } - return app.info.seInfo - + (TextUtils.isEmpty(app.info.seInfoUser) ? "" : app.info.seInfoUser) + extraInfo; + // 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; + } } - @GuardedBy("mService") boolean startProcessLocked(HostingRecord hostingRecord, String entryPoint, ProcessRecord app, int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags, int mountExternal, |