From c48c38dde5f34df8802b839967a46ceff7fa268c Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Sun, 12 Mar 2023 12:53:51 +0100 Subject: [PATCH] aidl: vibrator: Only handle actually supported effects * Let framework handle the other ones * On devices without hardware effects DOUBLE_CLICK effect is just a single click without this * Let's only keep CLICK and TICK if no hardware effects are supported, just like AOSP default vibrator impl Change-Id: Ib8bf299a417d82fe6196e1b071b5a7b2f9c3e5d8 --- aidl/vibrator/Vibrator.cpp | 40 +++++++++----------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/aidl/vibrator/Vibrator.cpp b/aidl/vibrator/Vibrator.cpp index d2491c6..11d7ff0 100644 --- a/aidl/vibrator/Vibrator.cpp +++ b/aidl/vibrator/Vibrator.cpp @@ -138,14 +138,13 @@ ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength strength, con } ndk::ScopedAStatus Vibrator::getSupportedEffects(std::vector* _aidl_return) { - *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::HEAVY_CLICK, - Effect::TICK, Effect::TEXTURE_TICK, Effect::THUD, Effect::POP, - Effect::RINGTONE_1, Effect::RINGTONE_2, Effect::RINGTONE_3, - Effect::RINGTONE_4, Effect::RINGTONE_5, Effect::RINGTONE_6, - Effect::RINGTONE_7, Effect::RINGTONE_7, Effect::RINGTONE_8, - Effect::RINGTONE_9, Effect::RINGTONE_10, Effect::RINGTONE_11, - Effect::RINGTONE_12, Effect::RINGTONE_13, Effect::RINGTONE_14, - Effect::RINGTONE_15}; + *_aidl_return = { Effect::CLICK, Effect::TICK }; + + if (mHasTimedOutEffect) { + for (const auto& effect : CP_TRIGGER_EFFECTS) { + _aidl_return->push_back(effect.first); + } + } return ndk::ScopedAStatus::ok(); } @@ -279,31 +278,10 @@ uint32_t Vibrator::effectToMs(Effect effect, ndk::ScopedAStatus* status) { switch (effect) { case Effect::CLICK: return 10; - case Effect::DOUBLE_CLICK: - return 15; case Effect::TICK: - case Effect::TEXTURE_TICK: - case Effect::THUD: - case Effect::POP: return 5; - case Effect::HEAVY_CLICK: - return 10; - case Effect::RINGTONE_1: - case Effect::RINGTONE_2: - case Effect::RINGTONE_3: - case Effect::RINGTONE_4: - case Effect::RINGTONE_5: - case Effect::RINGTONE_6: - case Effect::RINGTONE_7: - case Effect::RINGTONE_8: - case Effect::RINGTONE_9: - case Effect::RINGTONE_10: - case Effect::RINGTONE_11: - case Effect::RINGTONE_12: - case Effect::RINGTONE_13: - case Effect::RINGTONE_14: - case Effect::RINGTONE_15: - return 30000; + default: + break; } *status = ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); return 0; -- 2.20.1