Merge "vibrator vts: use CompositePrimitives enum_range" am: d895913f1b am: 8679c62cb7 am: 48ea7213f3

Change-Id: I6fd0ffa486f1ee5fac117009fa0bd7a7fb5b2a5c
This commit is contained in:
Automerger Merge Worker
2020-01-14 17:46:37 +00:00
3 changed files with 11 additions and 8 deletions

View File

@@ -0,0 +1,7 @@
{
"presubmit": [
{
"name": "VtsHalVibratorTargetTest"
}
]
}

View File

@@ -12,6 +12,7 @@ cc_test {
"android.hardware.vibrator-cpp",
],
test_suites: [
"general-tests",
"vts-core",
],
}

View File

@@ -49,14 +49,9 @@ const std::vector<EffectStrength> kInvalidEffectStrengths = {
static_cast<EffectStrength>(static_cast<int8_t>(kEffectStrengths.back()) + 1),
};
// TODO(b/143992652): autogenerate
const std::vector<CompositePrimitive> kCompositePrimitives = {
CompositePrimitive::NOOP, CompositePrimitive::CLICK,
CompositePrimitive::THUD, CompositePrimitive::SPIN,
CompositePrimitive::QUICK_RISE, CompositePrimitive::SLOW_RISE,
CompositePrimitive::QUICK_FALL,
};
// TODO(b/143992652): autogenerate
const std::vector<CompositePrimitive> kCompositePrimitives{
android::enum_range<CompositePrimitive>().begin(),
android::enum_range<CompositePrimitive>().end()};
const std::vector<CompositePrimitive> kInvalidPrimitives = {
static_cast<CompositePrimitive>(static_cast<int32_t>(kCompositePrimitives.front()) - 1),