From 61d357ebce4249d4d83dc4cd1c7495628297926f Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 17 Dec 2019 08:36:07 +0000 Subject: [PATCH] Revert submission Reason for revert: b/146402634 Change-Id: Ibaf2854bc5cbe63f557dcf63be9e285ef6678bd3 --- vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp index 7ed04f63ce..6f9ba1a96e 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 kEffects{android::enum_range().begin(), - android::enum_range().end()}; -const std::vector kEffectStrengths{android::enum_range().begin(), - android::enum_range().end()}; +// TODO(b/143992652): autogenerate +const std::vector 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 kEffectStrengths = {EffectStrength::LIGHT, EffectStrength::MEDIUM, + EffectStrength::STRONG}; const std::vector kInvalidEffects = { static_cast(static_cast(kEffects.front()) - 1),