commit 5ed80c5144d6b0e9064e7c5a34343de29d6f431e
author Shunkai Yao <yaoshunkai@google.com> Thu Sep 07 17:42:39 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Fri Sep 08 17:09:30 2023 +0000
tree b00bc73df52c138b04514c94056695878e204744
parent 8f28f8b8ea715ade3e62a0a0c0ce6ed94eaf97a7

Avoid sub_overflow_minimal in AIDL effects VTS

Bug: 299385610
Test: atest VtsHalHapticGeneratorTargetTest
Change-Id: I1721fb87dd373a40453505733c8aaee647b4cf3b

audio/aidl/vts/EffectHelper.h

diff --git a/audio/aidl/vts/EffectHelper.h b/audio/aidl/vts/EffectHelper.h
index 685d07d..2c8edf2 100644
--- a/audio/aidl/vts/EffectHelper.h
+++ b/audio/aidl/vts/EffectHelper.h
@@ -250,11 +250,11 @@
                    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

diff --git a/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp b/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp
index 54caed9..b33234b 100644
--- a/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp
+++ b/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp
@@ -208,7 +208,7 @@
         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)),