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

Commit d291f95d authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] HapticGenerator VTS: validate parameter before setting... 

[RESTRICT AUTOMERGE] HapticGenerator VTS: validate parameter before setting am: d994467f am: 7a03de84

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3276956



Change-Id: I900caf4f3944130783abdc46fd9b82a19cbc20a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 611c082c 7a03de84

audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp

+17 −11
Original line number Diff line number Diff line
@@ -121,9 +121,14 @@ class HapticGeneratorParamTest : public ::testing::TestWithParam<HapticGenerator 
            Parameter::Specific specific;

            specific.set<Parameter::Specific::hapticGenerator>(setHg);

            expectParam.set<Parameter::specific>(specific);

            EXPECT_STATUS(EX_NONE, mEffect->setParameter(expectParam)) << expectParam.toString();



            // get parameter

            const bool valid =

                    isParameterValid<HapticGenerator, Range::hapticGenerator>(setHg, mDescriptor);

            const binder_exception_t expected = valid ? EX_NONE : EX_ILLEGAL_ARGUMENT;

            EXPECT_STATUS(expected, mEffect->setParameter(expectParam)) << expectParam.toString();



            // only get if parameter in range and set success

            if (expected == EX_NONE) {

                Parameter getParam;

                Parameter::Id id;

                HapticGenerator::Id hgId;
@@ -134,6 +139,7 @@ class HapticGeneratorParamTest : public ::testing::TestWithParam<HapticGenerator 
                                                 << getParam.toString();

            }

        }

    }



    void addHapticScaleParam(int id, HapticGenerator::VibratorScale scale) {

        HapticGenerator setHg;