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

Commit 51627424 authored by Jesse Hall's avatar Jesse Hall
Browse files

resolve merge conflicts of b3a14176 to nyc-mr2-dev-plus-aosp 

Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
parents 6c123869 b3a14176

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

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.icu.impl.CacheValue; 
import android.icu.text.DecimalFormatSymbols;

import android.icu.util.ULocale;

import android.net.LocalServerSocket;

import android.opengl.EGL14;

import android.os.IInstalld;

import android.os.Process;

import android.os.RemoteException;
@@ -78,6 +79,7 @@ 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_GFX_DRIVER = "ro.gfx.driver.0";

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



    private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;
@@ -120,6 +122,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 +165,14 @@ public class ZygoteInit { 
        System.loadLibrary("jnigraphics");

    }



    private static void preloadOpenGL() {

        String driverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER);

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

                driverPackageName == null || driverPackageName.isEmpty()) {

            EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);

        }

    }



    private static void preloadTextResources() {

        Hyphenator.init();

        TextView.preloadFontCache();