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

Merge "Avoid preloading classes for boot image profiling" am: cfee28589b am: 84f358f9bf

Browse Source 
am: ac60bbb740

Change-Id: I48fa3fbc8b9f2859a084bf36d06117a1ea8970cf
This commit is contained in:
Mathieu Chartier
2019-10-25 13:20:46 -07:00
committed by android-build-merger
parent 0892a932df ac60bbb740
commit fca111db2f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,6 +248,18 @@ public class ZygoteInit {
InputStream is;
try {
// If we are profiling the boot image, avoid preloading classes.
// Can't use device_config since we are the zygote.
String prop = SystemProperties.get(
"persist.device_config.runtime_native_boot.profilebootclasspath", "");
// Might be empty if the property is unset since the default is "".
if (prop.length() == 0) {
prop = SystemProperties.get("dalvik.vm.profilebootclasspath", "");
}
if ("true".equals(prop)) {
return;
}
is = new FileInputStream(PRELOADED_CLASSES);
} catch (FileNotFoundException e) {
Log.e(TAG, "Couldn't find " + PRELOADED_CLASSES + ".");