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

Commit a50afa5e authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Make system server profiling an explicit runtime intent" 

am: 232011c7

Change-Id: I07e6b4f0e75ff96bda3d5ce5acf6b9ea1f999325
parents 43a1ab27 232011c7

core/java/com/android/internal/os/Zygote.java

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ public final class Zygote { 
     */

    public static final int API_ENFORCEMENT_POLICY_SHIFT =

            Integer.numberOfTrailingZeros(API_ENFORCEMENT_POLICY_MASK);

    /**

     * Enable system server ART profiling.

     */

    public static final int PROFILE_SYSTEM_SERVER = 1 << 14;



    /** No external storage should be mounted. */

    public static final int MOUNT_EXTERNAL_NONE = 0;

core/java/com/android/internal/os/ZygoteInit.java

+6 −0
Original line number Diff line number Diff line
@@ -671,6 +671,12 @@ public class ZygoteInit { 
            ZygoteConnection.applyDebuggerSystemProperty(parsedArgs);

            ZygoteConnection.applyInvokeWithSystemProperty(parsedArgs);



            boolean profileSystemServer = SystemProperties.getBoolean(

                    "dalvik.vm.profilesystemserver", false);

            if (profileSystemServer) {

                parsedArgs.runtimeFlags |= Zygote.PROFILE_SYSTEM_SERVER;

            }



            /* Request to fork the system server process */

            pid = Zygote.forkSystemServer(

                    parsedArgs.uid, parsedArgs.gid,