Merge "Allow disabling GL preload even if gfxdriver isn't updatable"

am: 9cf8c281d2

Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
This commit is contained in:
Jesse Hall
2017-06-08 15:41:46 +00:00
committed by android-build-merger

View File

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