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

am: 8cafe5d9b4

Change-Id: I024b5cf450aa2832bdd2638bd83b6d5048b80a7f
This commit is contained in:
Jesse Hall
2017-04-14 01:10:49 +00:00
committed by android-build-merger

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);
}
}