Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-03 12:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert submission" am: 9eca80bd16 am: 28a74dca87

Browse Source 
Change-Id: I9bff97633d1756cd2875cfd3c9038842adbd7397
This commit is contained in:
Automerger Merge Worker
2019-12-18 01:28:52 +00:00
parent 2d6ec086eb 28a74dca87
commit 403a67dae1
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
View File

@@ -34,18 +34,10 @@ using android::hardware::vibrator::Effect;
using android::hardware::vibrator::EffectStrength; using android::hardware::vibrator::EffectStrength;
using android::hardware::vibrator::IVibrator; using android::hardware::vibrator::IVibrator;
// TODO(b/143992652): autogenerate const std::vector<Effect> kEffects{android::enum_range<Effect>().begin(),
const std::vector<Effect> kEffects = { android::enum_range<Effect>().end()};
Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::THUD, const std::vector<EffectStrength> kEffectStrengths{android::enum_range<EffectStrength>().begin(),
Effect::POP, Effect::HEAVY_CLICK, Effect::RINGTONE_1, Effect::RINGTONE_2, android::enum_range<EffectStrength>().end()};
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 = { const std::vector<Effect> kInvalidEffects = {
static_cast<Effect>(static_cast<int32_t>(kEffects.front()) - 1), static_cast<Effect>(static_cast<int32_t>(kEffects.front()) - 1),