Merge "Decouple Game Driver from preloading graphics driver" into qt-dev

am: 1f66726d08

Change-Id: I77846d647f3f77f6af325f85a6a229d6c3c8d085
This commit is contained in:
Yiwei Zhang
2019-06-06 16:14:39 -07:00
committed by android-build-merger

View File

@@ -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();
} }
} }