Merge "ZygoteInit: remove extra copy of method" into nyc-mr1-dev-plus-aosp

am: 7bc107228c

* commit '7bc107228c0a41882f4202e568f48580d24bb7ba':
  ZygoteInit: remove extra copy of method

Change-Id: I93614394b6c5b97ba804bb7949f3c1b6a41ef510

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

@@ -240,24 +240,6 @@ public class ZygoteInit {
         Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
     }
 
-    /**
-     * Warm up the providers that are already registered.
-     *
-     * By doing it here we avoid that each app does it when requesting a service from the
-     * provider for the first time.
-     */
-    private static void warmUpJcaProviders() {
-        long startTime = SystemClock.uptimeMillis();
-        Trace.traceBegin(
-                Trace.TRACE_TAG_DALVIK, "Starting warm up of JCA providers");
-        for (Provider p : Security.getProviders()) {
-            p.warmUpServiceProvision();
-        }
-        Log.i(TAG, "Warmed up JCA providers in "
-                + (SystemClock.uptimeMillis()-startTime) + "ms.");
-        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
-    }
-
     /**
      * Performs Zygote process initialization. Loads and initializes
      * commonly used classes.