Remove dead code from the Zygote initialization.
Change-Id: Iad66437d6dae01ab94cfade86f3f7416a2896728
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index dea53bf..32ddc22 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -31,7 +31,6 @@
import dalvik.system.VMRuntime;
import dalvik.system.Zygote;
-import dalvik.system.SamplingProfiler;
import java.io.BufferedReader;
import java.io.FileDescriptor;
@@ -99,25 +98,6 @@
private static final boolean PRELOAD_RESOURCES = true;
/**
- * List of methods we "warm up" in the register map cache. These were
- * chosen because they appeared on the stack in GCs in multiple
- * applications.
- *
- * This is in a VM-ready format, to minimize string processing. If a
- * class is not already loaded, or a method is not found, the entry
- * will be skipped.
- *
- * This doesn't really merit a separately-generated input file at this
- * time. The list is fairly short, and the consequences of failure
- * are minor.
- */
- private static final String[] REGISTER_MAP_METHODS = {
- // (currently not doing any)
- //"Landroid/app/Activity;.setContentView:(I)V",
- };
-
-
- /**
* Invokes a static "main(argv[]) method on class "className".
* Converts various failing exceptions into RuntimeExceptions, with
* the assumption that they will then cause the VM instance to exit.
@@ -338,45 +318,6 @@
}
/**
- * Pre-caches register maps for methods that are commonly used.
- */
- private static void cacheRegisterMaps() {
- String failed = null;
- int failure;
- long startTime = System.nanoTime();
-
- failure = 0;
-
- for (int i = 0; i < REGISTER_MAP_METHODS.length; i++) {
- String str = REGISTER_MAP_METHODS[i];
-
- if (!Debug.cacheRegisterMap(str)) {
- if (failed == null)
- failed = str;
- failure++;
- }
- }
-
- long delta = System.nanoTime() - startTime;
-
- if (failure == REGISTER_MAP_METHODS.length) {
- if (REGISTER_MAP_METHODS.length > 0) {
- Log.i(TAG,
- "Register map caching failed (precise GC not enabled?)");
- }
- return;
- }
-
- Log.i(TAG, "Register map cache: found " +
- (REGISTER_MAP_METHODS.length - failure) + " of " +
- REGISTER_MAP_METHODS.length + " methods in " +
- (delta / 1000000L) + "ms");
- if (failure > 0) {
- Log.i(TAG, " First failure: " + failed);
- }
- }
-
- /**
* Load in commonly used resources, so they can be shared across
* processes.
*
@@ -564,7 +505,6 @@
EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START,
SystemClock.uptimeMillis());
preloadClasses();
- //cacheRegisterMaps();
preloadResources();
EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END,
SystemClock.uptimeMillis());