Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-04-14 01:00:41 +00:00
committed by Android (Google) Code Review

View File

@@ -186,8 +186,8 @@ public class ZygoteInit {
private static void preloadOpenGL() {
String driverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER);
if (!SystemProperties.getBoolean(PROPERTY_DISABLE_OPENGL_PRELOADING, false) ||
driverPackageName == null || driverPackageName.isEmpty()) {
if (!SystemProperties.getBoolean(PROPERTY_DISABLE_OPENGL_PRELOADING, false) &&
(driverPackageName == null || driverPackageName.isEmpty())) {
EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
}
}