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

Commit eea2a101 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change position of isSdkSandbox{Audit,Next} input selectors"" into main

parents 2229b0d9 4fd29b7e

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

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

import static android.system.OsConstants.EAGAIN;





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

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_LRU;

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

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

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

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

        return app.info.seInfo

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

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

                    + extraInfo;

        }

    }

    }







    @GuardedBy("mService")

    @GuardedBy("mService")

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

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

            int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags, int mountExternal,

            int uid, int[] gids, int runtimeFlags, int zygotePolicyFlags, int mountExternal,