tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Avoid sub_overflow_minimal in AIDL effects VTS" into main am: 5348432dea am: a2c4af080a am: 7b25756282

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

Change-Id: Ib7fcef94f5f0e29192c36dbd072108d0891b5004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shunkai Yao 2023-09-08 23:46:37 +00:00 committed by Automerger Merge Worker
commit 278b277322
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
audio/aidl/vts/EffectHelper.h
View file

@ -250,11 +250,11 @@ class EffectHelper {
maxLimit = std::numeric_limits<S>::max(); maxLimit = std::numeric_limits<S>::max();
if (s.size()) { if (s.size()) {
const auto min = *s.begin(), max = *s.rbegin(); const auto min = *s.begin(), max = *s.rbegin();
s.insert(min + (max - min) / 2); s.insert((min & max) + ((min ^ max) >> 1));
if (min != minLimit) { if (min > minLimit + 1) {
s.insert(min - 1); s.insert(min - 1);
} }
if (max != maxLimit) { if (max < maxLimit - 1) {
s.insert(max + 1); s.insert(max + 1);
} }
} }

2
audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp
View file

@ -208,7 +208,7 @@ INSTANTIATE_TEST_SUITE_P(
HapticGeneratorInvalidTest, HapticGeneratorParamTest, HapticGeneratorInvalidTest, HapticGeneratorParamTest,
::testing::Combine(testing::ValuesIn(EffectFactoryHelper::getAllEffectDescriptors( ::testing::Combine(testing::ValuesIn(EffectFactoryHelper::getAllEffectDescriptors(
IFactory::descriptor, getEffectTypeUuidHapticGenerator())), IFactory::descriptor, getEffectTypeUuidHapticGenerator())),
testing::Values(MIN_ID - 1), testing::Values(MIN_ID),
testing::Values(HapticGenerator::VibratorScale::NONE), testing::Values(HapticGenerator::VibratorScale::NONE),
testing::Values(MIN_FLOAT), testing::Values(MIN_FLOAT), testing::Values(MIN_FLOAT), testing::Values(MIN_FLOAT),
testing::Values(MIN_FLOAT)), testing::Values(MIN_FLOAT)),