Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename profileSystemServer to shouldProfileSystemServer" am: f7335ffb9a am: 2b3e8ad368

Browse Source 
am: 3f75400059

Change-Id: Id194bd88f4ac1cfd52e479f4f2401323dd83e596
This commit is contained in:
Mathieu Chartier
2019-09-10 08:57:58 -07:00
committed by android-build-merger
parent f74a3c9225 3f75400059
commit 8690600c23
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -460,7 +460,7 @@ public class ZygoteInit {
ZygoteHooks.gcAndFinalize(); ZygoteHooks.gcAndFinalize();
} }
private static boolean profileSystemServer() { private static boolean shouldProfileSystemServer() {
boolean defaultValue = SystemProperties.getBoolean("dalvik.vm.profilesystemserver", boolean defaultValue = SystemProperties.getBoolean("dalvik.vm.profilesystemserver",
/*default=*/ false); /*default=*/ false);
// Can't use DeviceConfig since it's not initialized at this point. // 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 // Capturing profiles is only supported for debug or eng builds since selinux normally
// prevents it. // prevents it.
if (profileSystemServer() && (Build.IS_USERDEBUG || Build.IS_ENG)) { if (shouldProfileSystemServer() && (Build.IS_USERDEBUG || Build.IS_ENG)) {
try { try {
Log.d(TAG, "Preparing system server profile"); Log.d(TAG, "Preparing system server profile");
prepareSystemServerProfile(systemServerClasspath); prepareSystemServerProfile(systemServerClasspath);
@@ -765,8 +765,7 @@ public class ZygoteInit {
Zygote.applyDebuggerSystemProperty(parsedArgs); Zygote.applyDebuggerSystemProperty(parsedArgs);
Zygote.applyInvokeWithSystemProperty(parsedArgs); Zygote.applyInvokeWithSystemProperty(parsedArgs);
if (profileSystemServer()) { if (shouldProfileSystemServer()) {
parsedArgs.mRuntimeFlags |= Zygote.PROFILE_SYSTEM_SERVER; parsedArgs.mRuntimeFlags |= Zygote.PROFILE_SYSTEM_SERVER;
} }