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

Commit 881da84c authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote" 

am: e8ce1276

Change-Id: Ib5f68ce3a05cdb6e6f1bba5f6a17d0848e9a27ab
parents d71e91b8 e8ce1276

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

+10 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import java.security.Provider; 
public class ZygoteInit {

    private static final String TAG = "Zygote";



    private static final String PROPERTY_DISABLE_OPENGL_PRELOADING = "ro.zygote.disable_gl_preload";

    private static final String PROPERTY_RUNNING_IN_CONTAINER = "ro.boot.container";



    private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;
@@ -120,6 +121,9 @@ public class ZygoteInit { 
        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadResources");

        preloadResources();

        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

        Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");

        preloadOpenGL();

        Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

        preloadSharedLibraries();

        preloadTextResources();

        // Ask the WebViewFactory to do any initialization that must run in the zygote process,
@@ -160,6 +164,12 @@ public class ZygoteInit { 
        System.loadLibrary("jnigraphics");

    }



    private static void preloadOpenGL() {

        if (!SystemProperties.getBoolean(PROPERTY_DISABLE_OPENGL_PRELOADING, false)) {

            EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);

        }

    }



    private static void preloadTextResources() {

        Hyphenator.init();

        TextView.preloadFontCache();