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

Commit 7b71992c authored by Sandro Montanari's avatar Sandro Montanari
Browse files

Change position of isSdkSandbox{Audit,Next} input selectors 

aosp/2836178 changed the seinfo parsing logic to
interpret the "complete" attribute as the end of
the seinfo string.

Since we were appending the ":isSdkSandbox*" input
selectors at the end of the seinfo string, those
selectors were being ignored.

This change moves the sandbox selectors to the
middle of the seinfo string, to make sure we parse
them correctly.

Bug: 295861450
Test: atest SdkSandboxAuditTests SdkSandboxNextTests
Change-Id: I14e2f3fba25bb93c136a38d5a4e4e48ab271650c
parent 412a1d55

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

+8 −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;
@@ -2065,10 +2066,14 @@ 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;

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

                    + extraInfo;

        }

    }





    @GuardedBy("mService")

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