diff options
| author | Jooyung Han <jooyung@google.com> | 2019-12-17 01:02:05 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-17 01:02:05 -0800 |
| commit | 4f3735c6dc09cf3f25d25f048fb5f80f652f788c (patch) | |
| tree | 6289e06eb4dfc2fe5d0c2daedfbfaaf5c81ba779 | |
| parent | 3988991a4aabee0fdbac8e661bbcf7cf70749a69 (diff) | |
| parent | 91770e0381db7e88bc78c0cbbb557f121638f1d5 (diff) | |
Merge "Revert submission"
am: 91770e0381
Change-Id: Ic2713b9b8bc4df480faae9d6324c8dcbd2c91418
| -rw-r--r-- | vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp index 0e2b3e1e0e..f47b10d34f 100644 --- a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp +++ b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp @@ -34,10 +34,18 @@ using android::hardware::vibrator::Effect; using android::hardware::vibrator::EffectStrength; using android::hardware::vibrator::IVibrator; -const std::vector<Effect> kEffects{android::enum_range<Effect>().begin(), - android::enum_range<Effect>().end()}; -const std::vector<EffectStrength> kEffectStrengths{android::enum_range<EffectStrength>().begin(), - android::enum_range<EffectStrength>().end()}; +// TODO(b/143992652): autogenerate +const std::vector<Effect> kEffects = { + Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::THUD, + Effect::POP, Effect::HEAVY_CLICK, Effect::RINGTONE_1, Effect::RINGTONE_2, + Effect::RINGTONE_3, Effect::RINGTONE_4, Effect::RINGTONE_5, Effect::RINGTONE_6, + 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, Effect::TEXTURE_TICK}; + +// TODO(b/143992652): autogenerate +const std::vector<EffectStrength> kEffectStrengths = {EffectStrength::LIGHT, EffectStrength::MEDIUM, + EffectStrength::STRONG}; const std::vector<Effect> kInvalidEffects = { static_cast<Effect>(static_cast<int32_t>(kEffects.front()) - 1), |