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

Merge "cs40l26: Fix the composed effect delay problem" into tm-qpr-dev am: 6be97cd21c am: e6cbf07d2b

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21351380

Change-Id: I2fd17d4b1b0ae020aa250f88ec8ab31869f1db96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2023-02-13 05:57:09 +00:00 • committed by Automerger Merge Worker
commit 06a6da8486
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vibrator/cs40l26/Vibrator.cpp
View file

@ -577,18 +577,7 @@ ndk::ScopedAStatus Vibrator::off() {
strerror(errno)); strerror(errno));
ret = false; ret = false;
} }
/* Do erase process */
if ((mActiveId >= WAVEFORM_MAX_PHYSICAL_INDEX) &&
(!mHwApiDef->eraseOwtEffect(mInputFd, mActiveId, &mFfEffects))) {
ALOGE("Off: Failed to clean up the composed effect %d", mActiveId);
ret = false;
}
if (mIsDual && (mActiveId >= WAVEFORM_MAX_PHYSICAL_INDEX) &&
(!mHwApiDual->eraseOwtEffect(mInputFdDual, mActiveId, &mFfEffectsDual))) {
ALOGE("Off: Failed to clean up flip's the composed effect %d", mActiveId);
ret = false;
}
if (!mHwGPIO->setGPIOOutput(false)) { if (!mHwGPIO->setGPIOOutput(false)) {
ALOGE("Off: Failed to reset GPIO(%d): %s", errno, strerror(errno)); ALOGE("Off: Failed to reset GPIO(%d): %s", errno, strerror(errno));
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE); return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);