Merge "Emit HDR output capabilities and HdrOutputControlSupported in HdrCapabilities Atom." into udc-dev

This commit is contained in:
Marc Kassis
2023-04-14 18:48:50 +00:00
committed by Android (Google) Code Review

View File

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