diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp index ed4f28cf5f..18d36e4c14 100644 --- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp +++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp @@ -655,8 +655,15 @@ TEST_P(GraphicsComposerAidlTest, SetHdrConversionStrategy_Force) { return; } const auto& [status, conversionCapabilities] = mComposerClient->getHdrConversionCapabilities(); + const auto& [status2, hdrCapabilities] = + mComposerClient->getHdrCapabilities(getPrimaryDisplayId()); + const auto& hdrTypes = hdrCapabilities.types; for (auto conversionCapability : conversionCapabilities) { if (conversionCapability.outputType != common::Hdr::INVALID) { + if (std::find(hdrTypes.begin(), hdrTypes.end(), conversionCapability.outputType) == + hdrTypes.end()) { + continue; + } common::HdrConversionStrategy hdrConversionStrategy; hdrConversionStrategy.set( conversionCapability.outputType); @@ -674,6 +681,11 @@ TEST_P(GraphicsComposerAidlTest, SetHdrConversionStrategy_Auto) { return; } const auto& [status, conversionCapabilities] = mComposerClient->getHdrConversionCapabilities(); + const auto& [status2, hdrCapabilities] = + mComposerClient->getHdrCapabilities(getPrimaryDisplayId()); + if (hdrCapabilities.types.size() <= 0) { + return; + } std::vector autoHdrTypes; for (auto conversionCapability : conversionCapabilities) { if (conversionCapability.outputType != common::Hdr::INVALID) {