diff options
| author | 2017-04-13 15:44:24 -0700 | |
|---|---|---|
| committer | 2017-04-13 15:53:28 -0700 | |
| commit | 5d911fe6bb8f05a69b208fafeb3f6bd4b13f06ad (patch) | |
| tree | 5c9bc974505950c8945be2116ba316e33d801c60 | |
| parent | bc4bd823d9b7acaf6fd715e24496bab2731de0be (diff) | |
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/<pid>/maps
Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 4 |
1 files 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); } } |