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

Commit 66245d12 authored by Ryan Prichard's avatar Ryan Prichard Committed by Android (Google) Code Review
Browse files

Merge changes I820ac945,Ie16ada6f,I50cc5354 into main 

* changes:
  [sf] HdrOutputControlTest: fix strategy arguments
  [sf] Stop inheriting from std::unary_function
  TFLite: Accommodate change in std::span size type
parents 6624ee44 0dfa358c

libs/input/tests/TfLiteMotionPredictor_test.cpp

+10 −10
Original line number Diff line number Diff line
@@ -130,19 +130,19 @@ TEST(TfLiteMotionPredictorTest, ModelInputOutputLength) { 
    std::unique_ptr<TfLiteMotionPredictorModel> model = TfLiteMotionPredictorModel::create();

    ASSERT_GT(model->inputLength(), 0u);



    const int inputLength = model->inputLength();

    ASSERT_EQ(inputLength, model->inputR().size());

    ASSERT_EQ(inputLength, model->inputPhi().size());

    ASSERT_EQ(inputLength, model->inputPressure().size());

    ASSERT_EQ(inputLength, model->inputOrientation().size());

    ASSERT_EQ(inputLength, model->inputTilt().size());

    const size_t inputLength = model->inputLength();

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputR().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputPhi().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputPressure().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputOrientation().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputTilt().size()));



    ASSERT_TRUE(model->invoke());



    const int outputLength = model->outputLength();

    ASSERT_EQ(outputLength, model->outputR().size());

    ASSERT_EQ(outputLength, model->outputPhi().size());

    ASSERT_EQ(outputLength, model->outputPressure().size());

    const size_t outputLength = model->outputLength();

    ASSERT_EQ(outputLength, static_cast<size_t>(model->outputR().size()));

    ASSERT_EQ(outputLength, static_cast<size_t>(model->outputPhi().size()));

    ASSERT_EQ(outputLength, static_cast<size_t>(model->outputPressure().size()));

}



TEST(TfLiteMotionPredictorTest, ModelOutput) {

services/surfaceflinger/tests/tracing/TransactionTraceTestSuite.cpp

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ inline void PrintTo(const LayerInfo& info, ::std::ostream* os) { 
        << info.touchableRegionBounds.right << "," << info.touchableRegionBounds.bottom << "}";

}



struct find_id : std::unary_function<LayerInfo, bool> {

struct find_id {

    uint64_t id;

    find_id(uint64_t id) : id(id) {}

    bool operator()(LayerInfo const& m) const { return m.id == id; }

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));