Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 793f0a39 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

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

am: e20f42b8

Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
parents 82dad75c e20f42b8

core/java/com/android/internal/os/ZygoteInit.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -186,8 +186,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);

        }

        }

    }

    }