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

Commit ea63eff7 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "[sf] HdrOutputControlTest: fix strategy arguments" into main am: e3af352d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2794758



Change-Id: If53b0ce491374b56308cb364b86d31f07907f293
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3ef24f6 e3af352d

services/surfaceflinger/tests/unittests/SurfaceFlinger_HdrOutputControlTest.cpp

+7 −11
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 


namespace android {



using aidl::android::hardware::graphics::common::HdrConversionCapability;

using aidl::android::hardware::graphics::common::HdrConversionStrategy;

using GuiHdrConversionStrategyTag = gui::HdrConversionStrategy::Tag;

using gui::aidl_utils::statusTFromBinderStatus;
@@ -66,17 +64,15 @@ TEST(HdrOutputControlTest, testSetHdrConversionStrategy) { 
            sf->getHdrOutputConversionSupport(&hdrOutputConversionSupport);

    ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(getSupportStatus));



    std::vector<HdrConversionStrategy> strategies =

            {HdrConversionStrategy(std::in_place_index<static_cast<size_t>(

                                           GuiHdrConversionStrategyTag::passthrough)>),

             HdrConversionStrategy(std::in_place_index<static_cast<size_t>(

                                           GuiHdrConversionStrategyTag::autoAllowedHdrTypes)>),

             HdrConversionStrategy(std::in_place_index<static_cast<size_t>(

                                           GuiHdrConversionStrategyTag::forceHdrConversion)>)};

    std::vector<gui::HdrConversionStrategy> strategies = {

            gui::HdrConversionStrategy::make<GuiHdrConversionStrategyTag::passthrough>(),

            gui::HdrConversionStrategy::make<GuiHdrConversionStrategyTag::autoAllowedHdrTypes>(),

            gui::HdrConversionStrategy::make<GuiHdrConversionStrategyTag::forceHdrConversion>(),

    };

    int32_t outPreferredHdrOutputType = 0;



    for (HdrConversionStrategy strategy : strategies) {

        binder::Status status = sf->setHdrConversionStrategy(&strategy, &outPreferredHdrOutputType);

    for (const gui::HdrConversionStrategy& strategy : strategies) {

        binder::Status status = sf->setHdrConversionStrategy(strategy, &outPreferredHdrOutputType);



        if (hdrOutputConversionSupport) {

            ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(status));