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

Merge "Clean up class preloading"

Browse Source 
am: 4082bc010b

Change-Id: I719d2a223a1ab17aed832b618e26091cb3e368e8
This commit is contained in:
Mathieu Chartier
2019-08-29 15:23:26 -07:00
committed by android-build-merger
parent d5314968e6 4082bc010b
commit 5b2da73fa3
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,11 +91,6 @@ public class ZygoteInit {
private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020; private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;
private static final int LOG_BOOT_PROGRESS_PRELOAD_END = 3030; private static final int LOG_BOOT_PROGRESS_PRELOAD_END = 3030;
/**
* when preloading, GC after allocating this many bytes
*/
private static final int PRELOAD_GC_THRESHOLD = 50000;
private static final String ABI_LIST_ARG = "--abi-list="; private static final String ABI_LIST_ARG = "--abi-list=";
// TODO (chriswailes): Re-name this --zygote-socket-name= and then add a // TODO (chriswailes): Re-name this --zygote-socket-name= and then add a
@@ -280,11 +275,6 @@ public class ZygoteInit {
droppedPriviliges = true; droppedPriviliges = true;
} }
// Alter the target heap utilization. With explicit GCs this
// is not likely to have any effect.
float defaultUtilization = runtime.getTargetHeapUtilization();
runtime.setTargetHeapUtilization(0.8f);
try { try {
BufferedReader br = BufferedReader br =
new BufferedReader(new InputStreamReader(is), Zygote.SOCKET_BUFFER_SIZE); new BufferedReader(new InputStreamReader(is), Zygote.SOCKET_BUFFER_SIZE);
@@ -300,9 +290,6 @@ public class ZygoteInit {
Trace.traceBegin(Trace.TRACE_TAG_DALVIK, line); Trace.traceBegin(Trace.TRACE_TAG_DALVIK, line);
try { try {
if (false) {
Log.v(TAG, "Preloading " + line + "...");
}
// Load and explicitly initialize the given class. Use // Load and explicitly initialize the given class. Use
// Class.forName(String, boolean, ClassLoader) to avoid repeated stack lookups // Class.forName(String, boolean, ClassLoader) to avoid repeated stack lookups
// (to derive the caller's class-loader). Use true to force initialization, and // (to derive the caller's class-loader). Use true to force initialization, and
@@ -333,8 +320,6 @@ public class ZygoteInit {
Log.e(TAG, "Error reading " + PRELOADED_CLASSES + ".", e); Log.e(TAG, "Error reading " + PRELOADED_CLASSES + ".", e);
} finally { } finally {
IoUtils.closeQuietly(is); IoUtils.closeQuietly(is);
// Restore default.
runtime.setTargetHeapUtilization(defaultUtilization);
// Fill in dex caches with classes, fields, and methods brought in by preloading. // Fill in dex caches with classes, fields, and methods brought in by preloading.
Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadDexCaches"); Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadDexCaches");