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

Commit 06936fcb authored by Yiwei Zhang's avatar Yiwei Zhang Committed by android-build-merger
Browse files

Merge "Decouple Game Driver from preloading graphics driver" into qt-dev am: 1f66726d 

am: d480e6a0

Change-Id: I908bee821a44fd1ec8223166d52f81cc682e9e43
parents a839ce7e d480e6a0

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -87,7 +87,6 @@ public class ZygoteInit { 




    private static final String PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING =

    private static final String PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING =

            "ro.zygote.disable_gl_preload";

            "ro.zygote.disable_gl_preload";

    private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0";





    private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;

    private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;

    private static final int LOG_BOOT_PROGRESS_PRELOAD_END = 3030;

    private static final int LOG_BOOT_PROGRESS_PRELOAD_END = 3030;
@@ -203,9 +202,7 @@ public class ZygoteInit { 
    static native void nativePreloadGraphicsDriver();

    static native void nativePreloadGraphicsDriver();





    private static void maybePreloadGraphicsDriver() {

    private static void maybePreloadGraphicsDriver() {

        String driverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER);

        if (!SystemProperties.getBoolean(PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING, false)) {

        if (!SystemProperties.getBoolean(PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING, false)

                && (driverPackageName == null || driverPackageName.isEmpty())) {

            nativePreloadGraphicsDriver();

            nativePreloadGraphicsDriver();

        }

        }

    }

    }