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

Commit ed511cde authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Rename profileSystemServer to shouldProfileSystemServer" am: f7335ffb... 

Merge "Rename profileSystemServer to shouldProfileSystemServer" am: f7335ffb am: 2b3e8ad3 am: 3f754000
am: 8690600c

Change-Id: I8e06ce4174e091c1aa97dc976ce1ec172709628d
parents 3fbb9535 8690600c

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

+3 −4
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ public class ZygoteInit { 
        ZygoteHooks.gcAndFinalize();

    }



    private static boolean profileSystemServer() {

    private static boolean shouldProfileSystemServer() {

        boolean defaultValue = SystemProperties.getBoolean("dalvik.vm.profilesystemserver",

                /*default=*/ false);

        // Can't use DeviceConfig since it's not initialized at this point.
@@ -492,7 +492,7 @@ public class ZygoteInit { 
            }

            // Capturing profiles is only supported for debug or eng builds since selinux normally

            // prevents it.

            if (profileSystemServer() && (Build.IS_USERDEBUG || Build.IS_ENG)) {

            if (shouldProfileSystemServer() && (Build.IS_USERDEBUG || Build.IS_ENG)) {

                try {

                    Log.d(TAG, "Preparing system server profile");

                    prepareSystemServerProfile(systemServerClasspath);
@@ -765,8 +765,7 @@ public class ZygoteInit { 
            Zygote.applyDebuggerSystemProperty(parsedArgs);

            Zygote.applyInvokeWithSystemProperty(parsedArgs);



            if (profileSystemServer()) {



            if (shouldProfileSystemServer()) {

                parsedArgs.mRuntimeFlags |= Zygote.PROFILE_SYSTEM_SERVER;

            }