Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[DO NOT MERGE] vibrator/cs40l26: Fix unsupport primitive effects test" into tm-qpr-dev

Browse source
This commit is contained in:
Chase Wu 2023-01-31 03:25:44 +00:00 • committed by Android (Google) Code Review
commit d7df9abc72
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vibrator/cs40l26/Vibrator.cpp
View file

@ -765,16 +765,15 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect> &composi
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
} }
if(effectScale < mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)]) {
effectScale = mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)];
}
if (e_curr.primitive != CompositePrimitive::NOOP) { if (e_curr.primitive != CompositePrimitive::NOOP) {
ndk::ScopedAStatus status; ndk::ScopedAStatus status;
status = getPrimitiveDetails(e_curr.primitive, &effectIndex); status = getPrimitiveDetails(e_curr.primitive, &effectIndex);
if (!status.isOk()) { if (!status.isOk()) {
return status; return status;
} }
if (effectScale < mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)]) {
effectScale = mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)];
}
effectVolLevel = intensityToVolLevel(effectScale, effectIndex); effectVolLevel = intensityToVolLevel(effectScale, effectIndex);
totalDuration += mEffectDurations[effectIndex]; totalDuration += mEffectDurations[effectIndex];
} }