Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafd44b9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10086753 from 9bd4fb37 to udc-release 

Change-Id: I9ccfd7f554838d77f65b956a7f13c165ec7939c5
parents 5405e06c 9bd4fb37

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+12 −0
Original line number Diff line number Diff line
@@ -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<common::HdrConversionStrategy::Tag::forceHdrConversion>(

                    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<aidl::android::hardware::graphics::common::Hdr> autoHdrTypes;

    for (auto conversionCapability : conversionCapabilities) {

        if (conversionCapability.outputType != common::Hdr::INVALID) {