Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80755a5a authored by Sergio Giro's avatar Sergio Giro
Browse files

ZygoteInit: install AndroidKeyStoreProvider in the Zygote 

Instead of in activity thread. That way, we can warm up (ie,
precompute cached values) this provider and AndroidBCWorkaroundProvider
(which are installed together) so that the computation doesn't
happen in the app. As a result, the time spent in the first call to
SSLSocketFactory.getDefault() decreases by ~5ms in angler userdebug.
Measured with an app calling SSLSocketFactory.getDefault in onCreate
and timed it with System.currentTimeMillis() .

(cherry picked from commit 69de3207)

Bug: 28545496
Change-Id: Ic4e11d058fb404eaa92db925a3e765fc3bef7ae2
parent 6f4b5661

core/java/android/app/ActivityThread.java

+0 −3
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ import android.view.Window; 
import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.renderscript.RenderScriptCacheDir;

import android.security.keystore.AndroidKeyStoreProvider;

import android.system.Os;

import android.system.OsConstants;

import android.system.ErrnoException;
@@ -5461,8 +5460,6 @@ public final class ActivityThread { 
        // Set the reporter for event logging in libcore

        EventLogger.setReporter(new EventLoggingReporter());



        AndroidKeyStoreProvider.install();



        // Make sure TrustedCertificateStore looks in the right place for CA certificates

        final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId());

        TrustedCertificateStore.setDefaultUserDirectory(configDir);

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

+14 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Process; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.security.keystore.AndroidKeyStoreProvider;

import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;
@@ -247,13 +248,24 @@ public class ZygoteInit { 
    }



    /**

     * Warm up the providers that are already registered.

     * Register AndroidKeyStoreProvider and 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 installation of AndroidKeyStoreProvider");

        // AndroidKeyStoreProvider.install() manipulates the list of JCA providers to insert

        // preferred providers. Note this is not done via security.properties as the JCA providers

        // are not on the classpath in the case of, for example, raw dalvikvm runtimes.

        AndroidKeyStoreProvider.install();

        Log.i(TAG, "Installed AndroidKeyStoreProvider in "

                + (SystemClock.uptimeMillis() - startTime) + "ms.");

        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);



        startTime = SystemClock.uptimeMillis();

        Trace.traceBegin(

                Trace.TRACE_TAG_DALVIK, "Starting warm up of JCA providers");

        for (Provider p : Security.getProviders()) {