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

Commit 49336421 authored by android-build-prod (mdb)'s avatar android-build-prod (mdb) Committed by android-build-merger
Browse files

Merge "Replace hidl_enum_{iterator -> range}." am: 71d7d91b 

am: 030935b4

Change-Id: I114e81425ba04519981121bb511732090fcdbd00
parents 9ace0030 030935b4

neuralnetworks/1.0/vts/functional/ValidateModel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static void mutateOperationOperandTypeTest(const sp<IDevice>& device, const V1_0 
        if (mutateOperationOperandTypeSkip(operand, model)) {

            continue;

        }

        for (OperandType invalidOperandType : hidl_enum_iterator<OperandType>{}) {

        for (OperandType invalidOperandType : hidl_enum_range<OperandType>{}) {

            // Do not test OEM types

            if (invalidOperandType == model.operands[operand].type ||

                invalidOperandType == OperandType::OEM ||

neuralnetworks/1.1/vts/functional/ValidateModel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static void mutateOperationOperandTypeTest(const sp<IDevice>& device, const V1_1 
        if (mutateOperationOperandTypeSkip(operand, model)) {

            continue;

        }

        for (OperandType invalidOperandType : hidl_enum_iterator<OperandType>{}) {

        for (OperandType invalidOperandType : hidl_enum_range<OperandType>{}) {

            // Do not test OEM types

            if (invalidOperandType == model.operands[operand].type ||

                invalidOperandType == OperandType::OEM ||