diff options
| author | Jason Macnak <natsu@google.com> | 2023-11-20 21:26:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 21:26:13 +0000 |
| commit | 215854057dc3e1db98c0b1a4e6ff770f990ef92f (patch) | |
| tree | 2c5063fdf41b088e94d0806dc99edf3b39fe2b7b | |
| parent | 77c6a709252c40e17e0f07c113eef3fcc1fa5987 (diff) | |
| parent | 04a7b99e0480c75f508078b2a8b205f160454999 (diff) | |
| download | goldfish-opengl-215854057dc3e1db98c0b1a4e6ff770f990ef92f.tar.gz | |
Fix switch statement for HDR conversion strat am: 04a7b99e04tmp_amf_315507370
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2838957
Change-Id: Iaa27a373d06dcf57441c75e9523151c78a2de03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/hwc3/ComposerClient.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/system/hwc3/ComposerClient.cpp b/system/hwc3/ComposerClient.cpp index ad23406b..2cadedeb 100644 --- a/system/hwc3/ComposerClient.cpp +++ b/system/hwc3/ComposerClient.cpp @@ -604,11 +604,18 @@ ndk::ScopedAStatus ComposerClient::setHdrConversionStrategy( aidl::android::hardware::graphics::common::Hdr* preferredHdrOutputType) { DEBUG_LOG("%s", __FUNCTION__); using HdrConversionStrategyTag = aidl::android::hardware::graphics::common::HdrConversionStrategy::Tag; - switch (conversionStrategy.getTag() == HdrConversionStrategyTag::autoAllowedHdrTypes) { + switch (conversionStrategy.getTag()) { + case HdrConversionStrategyTag::autoAllowedHdrTypes: { auto autoHdrTypes = conversionStrategy.get<HdrConversionStrategyTag::autoAllowedHdrTypes>(); if (autoHdrTypes.size() != 0) { return ToBinderStatus(HWC3::Error::Unsupported); } + break; + } + case HdrConversionStrategyTag::passthrough: + case HdrConversionStrategyTag::forceHdrConversion: { + break; + } } *preferredHdrOutputType = aidl::android::hardware::graphics::common::Hdr::INVALID; return ToBinderStatus(HWC3::Error::None); |