Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
This commit is contained in:
Jesse Hall
2017-02-10 15:53:27 -08:00
parent 6c1238699b b3a1417663
commit 516274249f
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -25,6 +25,7 @@ import android.icu.impl.CacheValue;
import android.icu.text.DecimalFormatSymbols; import android.icu.text.DecimalFormatSymbols;
import android.icu.util.ULocale; import android.icu.util.ULocale;
import android.net.LocalServerSocket; import android.net.LocalServerSocket;
import android.opengl.EGL14;
import android.os.IInstalld; import android.os.IInstalld;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
@@ -78,6 +79,7 @@ public class ZygoteInit {
private static final String TAG = "Zygote"; private static final String TAG = "Zygote";
private static final String PROPERTY_DISABLE_OPENGL_PRELOADING = "ro.zygote.disable_gl_preload"; 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 String PROPERTY_RUNNING_IN_CONTAINER = "ro.boot.container";
private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020; private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;
@@ -120,6 +122,9 @@ public class ZygoteInit {
Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadResources"); Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadResources");
preloadResources(); preloadResources();
Trace.traceEnd(Trace.TRACE_TAG_DALVIK); Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");
preloadOpenGL();
Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
preloadSharedLibraries(); preloadSharedLibraries();
preloadTextResources(); preloadTextResources();
// Ask the WebViewFactory to do any initialization that must run in the zygote process, // Ask the WebViewFactory to do any initialization that must run in the zygote process,
@@ -160,6 +165,14 @@ public class ZygoteInit {
System.loadLibrary("jnigraphics"); 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() { private static void preloadTextResources() {
Hyphenator.init(); Hyphenator.init();
TextView.preloadFontCache(); TextView.preloadFontCache();