sm7125-common: 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
urubino-microg
Tim Zimmermann 2 years ago committed by Ruchit
parent a2f64ffc5c
commit 898ac148a9
  1. 38
      vibrator/Vibrator.cpp

@ -115,14 +115,7 @@ ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength strength, con
}
ndk::ScopedAStatus Vibrator::getSupportedEffects(std::vector<Effect>* _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 };
return ndk::ScopedAStatus::ok();
}
@ -259,32 +252,11 @@ uint32_t Vibrator::effectToMs(Effect effect, ndk::ScopedAStatus* status) {
switch (effect) {
case Effect::CLICK:
return 20;
case Effect::DOUBLE_CLICK:
return 25;
case Effect::HEAVY_CLICK:
return 30;
return 10;
case Effect::TICK:
case Effect::TEXTURE_TICK:
case Effect::THUD:
case Effect::POP:
return 15;
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 300;
return 5;
default:
break;
}
*status = ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);

Loading…
Cancel
Save