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

Commit 5348432d authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge "Avoid sub_overflow_minimal in AIDL effects VTS" into main

parents a34b74b8 5ed80c51

audio/aidl/vts/EffectHelper.h

+3 −3
Original line number Diff line number Diff line
@@ -250,11 +250,11 @@ class EffectHelper { 
                   maxLimit = std::numeric_limits<S>::max();

        if (s.size()) {

            const auto min = *s.begin(), max = *s.rbegin();

            s.insert(min + (max - min) / 2);

            if (min != minLimit) {

            s.insert((min & max) + ((min ^ max) >> 1));

            if (min > minLimit + 1) {

                s.insert(min - 1);

            }

            if (max != maxLimit) {

            if (max < maxLimit - 1) {

                s.insert(max + 1);

            }

        }

audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ INSTANTIATE_TEST_SUITE_P( 
        HapticGeneratorInvalidTest, HapticGeneratorParamTest,

        ::testing::Combine(testing::ValuesIn(EffectFactoryHelper::getAllEffectDescriptors(

                                   IFactory::descriptor, getEffectTypeUuidHapticGenerator())),

                           testing::Values(MIN_ID - 1),

                           testing::Values(MIN_ID),

                           testing::Values(HapticGenerator::VibratorScale::NONE),

                           testing::Values(MIN_FLOAT), testing::Values(MIN_FLOAT),

                           testing::Values(MIN_FLOAT)),