diff options
| author | 2017-06-08 15:34:42 +0000 | |
|---|---|---|
| committer | 2017-06-08 15:34:44 +0000 | |
| commit | 9cf8c281d2c66b78f6f3fd8bd54d327cc3a211c9 (patch) | |
| tree | 5b3d37e23c2c82c523c0bd8bc1be5ea301f6a3c4 | |
| parent | 32703994fe80583e4779bc0be9829c32635c5812 (diff) | |
| parent | f20fdb93205fefd80364383812fe645307d08462 (diff) | |
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
| -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 bd7590387f41..b7dff963abe8 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -167,8 +167,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); } } |