Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a959ccbc33
@@ -79,7 +79,6 @@ import java.util.ArrayList;
|
|||||||
public class ZygoteInit {
|
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_RUNNING_IN_CONTAINER = "ro.boot.container";
|
private static final String PROPERTY_RUNNING_IN_CONTAINER = "ro.boot.container";
|
||||||
|
|
||||||
private static final String ANDROID_SOCKET_PREFIX = "ANDROID_SOCKET_";
|
private static final String ANDROID_SOCKET_PREFIX = "ANDROID_SOCKET_";
|
||||||
@@ -199,9 +198,6 @@ 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,
|
||||||
@@ -242,12 +238,6 @@ public class ZygoteInit {
|
|||||||
System.loadLibrary("jnigraphics");
|
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() {
|
private static void preloadTextResources() {
|
||||||
Hyphenator.init();
|
Hyphenator.init();
|
||||||
TextView.preloadFontCache();
|
TextView.preloadFontCache();
|
||||||
|
|||||||
Reference in New Issue
Block a user