Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I93a7c79612c189198ef1200d471b685c35664694
This commit is contained in:
Tim Van Patten
2021-12-08 17:10:36 +00:00
committed by Automerger Merge Worker
parent b2297eefe7 c6d9eda8c0
commit 4d3d322f09
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/os/GraphicsEnvironment.java
View File

@@ -67,6 +67,9 @@ public class GraphicsEnvironment {
private static final String SYSTEM_DRIVER_NAME = "system"; private static final String SYSTEM_DRIVER_NAME = "system";
private static final String SYSTEM_DRIVER_VERSION_NAME = ""; private static final String SYSTEM_DRIVER_VERSION_NAME = "";
private static final long SYSTEM_DRIVER_VERSION_CODE = 0; 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. // System properties related to updatable graphics drivers.
private static final String PROPERTY_GFX_DRIVER_PRODUCTION = "ro.gfx.driver.0"; 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.traceEnd(Trace.TRACE_TAG_GRAPHICS);
Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "setupAngle"); 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.traceEnd(Trace.TRACE_TAG_GRAPHICS);
Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "chooseDriver"); Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "chooseDriver");
if (!chooseDriver(context, coreSettings, pm, packageName, appInfoWithMetaData)) { if (!chooseDriver(context, coreSettings, pm, packageName, appInfoWithMetaData)) {
setGpuStats(SYSTEM_DRIVER_NAME, SYSTEM_DRIVER_VERSION_NAME, SYSTEM_DRIVER_VERSION_CODE, if (!useAngle) {
SystemProperties.getLong(PROPERTY_GFX_DRIVER_BUILD_TIME, 0), packageName, setGpuStats(SYSTEM_DRIVER_NAME, SYSTEM_DRIVER_VERSION_NAME,
getVulkanVersion(pm)); SYSTEM_DRIVER_VERSION_CODE,
SystemProperties.getLong(PROPERTY_GFX_DRIVER_BUILD_TIME, 0),
packageName, getVulkanVersion(pm));
}
} }
Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS); Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);
} }