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

Commit 4d3d322f authored by Tim Van Patten's avatar Tim Van Patten Committed by Automerger Merge Worker
Browse files

Merge "Correctly call setGpuStats() for ANGLE/system driver" am: c6d9eda8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906687

Change-Id: I93a7c79612c189198ef1200d471b685c35664694
parents b2297eef c6d9eda8

core/java/android/os/GraphicsEnvironment.java

+17 −4
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ public class GraphicsEnvironment { 
    private static final String SYSTEM_DRIVER_NAME = "system";

    private static final String SYSTEM_DRIVER_VERSION_NAME = "";

    private static final long SYSTEM_DRIVER_VERSION_CODE = 0;

    private static final String ANGLE_DRIVER_NAME = "angle";

    private static final String ANGLE_DRIVER_VERSION_NAME = "";

    private static final long ANGLE_DRIVER_VERSION_CODE = 0;



    // System properties related to updatable graphics drivers.

    private static final String PROPERTY_GFX_DRIVER_PRODUCTION = "ro.gfx.driver.0";
@@ -134,14 +137,24 @@ public class GraphicsEnvironment { 
        Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);



        Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "setupAngle");

        setupAngle(context, coreSettings, pm, packageName);

        boolean useAngle = false;

        if (setupAngle(context, coreSettings, pm, packageName)) {

            if (shouldUseAngle(context, coreSettings, packageName)) {

                useAngle = true;

                setGpuStats(ANGLE_DRIVER_NAME, ANGLE_DRIVER_VERSION_NAME, ANGLE_DRIVER_VERSION_CODE,

                        0, packageName, getVulkanVersion(pm));

            }

        }

        Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);



        Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "chooseDriver");

        if (!chooseDriver(context, coreSettings, pm, packageName, appInfoWithMetaData)) {

            setGpuStats(SYSTEM_DRIVER_NAME, SYSTEM_DRIVER_VERSION_NAME, SYSTEM_DRIVER_VERSION_CODE,

                    SystemProperties.getLong(PROPERTY_GFX_DRIVER_BUILD_TIME, 0), packageName,

                    getVulkanVersion(pm));

            if (!useAngle) {

                setGpuStats(SYSTEM_DRIVER_NAME, SYSTEM_DRIVER_VERSION_NAME,

                        SYSTEM_DRIVER_VERSION_CODE,

                        SystemProperties.getLong(PROPERTY_GFX_DRIVER_BUILD_TIME, 0),

                        packageName, getVulkanVersion(pm));

            }

        }

        Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);

    }