From 9c98678a5e2abaa410b0a8e7f8210af8f299fee7 Mon Sep 17 00:00:00 2001 From: Marc Kassis Date: Wed, 12 Apr 2023 14:43:25 +0200 Subject: [PATCH] Emit HDR output capabilities and HdrOutputControlSupported in HdrCapabilities Atom. Bug: 234816344 Test: statsd_testdrive 10175 Change-Id: Ied10c520d7de50672819b8feec6b99b6ccbe00c6 --- .../android/server/stats/pull/StatsPullAtomService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 433d8076d1f8c..86403779d35a8 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -21,6 +21,7 @@ import static android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED; import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED; import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS; import static android.hardware.display.HdrConversionMode.HDR_CONVERSION_PASSTHROUGH; +import static android.hardware.display.HdrConversionMode.HDR_CONVERSION_UNSUPPORTED; import static android.hardware.graphics.common.Hdr.DOLBY_VISION; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET; @@ -4721,9 +4722,12 @@ public class StatsPullAtomService extends SystemService { boolean userDisabledHdrConversion = hdrConversionMode == HDR_CONVERSION_PASSTHROUGH; int forceHdrFormat = preferredHdrType == HDR_TYPE_INVALID ? 0 : preferredHdrType; boolean hasDolbyVisionIssue = hasDolbyVisionIssue(display); + byte[] hdrOutputTypes = toBytes(displayManager.getSupportedHdrOutputTypes()); + boolean hdrOutputControlSupported = hdrConversionMode != HDR_CONVERSION_UNSUPPORTED; - pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, - new byte[0], userDisabledHdrConversion, forceHdrFormat, hasDolbyVisionIssue)); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, hdrOutputTypes, + userDisabledHdrConversion, forceHdrFormat, hasDolbyVisionIssue, + hdrOutputControlSupported)); return StatsManager.PULL_SUCCESS; }