From 5d911fe6bb8f05a69b208fafeb3f6bd4b13f06ad Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Thu, 13 Apr 2017 15:44:24 -0700 Subject: Allow disabling GL preload even if gfxdriver isn't updatable Bug: 34611670 Test: set ro.zygote.disable_gl_preload=1, shell start, confirm GL driver isn't loaded in zygote process by checking /proc//maps Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf --- core/java/com/android/internal/os/ZygoteInit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 67bce8c59309..95b0117aa88b 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -183,8 +183,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); } } -- cgit v1.2.3-59-g8ed1b