| commit | 3594703db56fe3f2955ff6c8cbd789cf52494c57 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 18 13:56:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 18 13:56:20 2021 +0000 |
| tree | 57f3c24f7de3eae335c0abae9c5c4354d46dcfc4 | |
| parent | 81a8e67f791fdd3a44db3962773acb093979c949 [diff] | |
| parent | cca7e93111f4c160b7ee99e9a28c624b9e1fd773 [diff] |
Merge "Fix default vibrator HAL to check support on getPrimitiveDuration" into sc-dev am: cca7e93111 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14985772 Change-Id: I95c0ebf06c8b058d5dd0c067e834f43430c87c6d
diff --git a/vibrator/aidl/default/Vibrator.cpp b/vibrator/aidl/default/Vibrator.cpp index c6682b3..5755ce5 100644 --- a/vibrator/aidl/default/Vibrator.cpp +++ b/vibrator/aidl/default/Vibrator.cpp
@@ -138,6 +138,11 @@ ndk::ScopedAStatus Vibrator::getPrimitiveDuration(CompositePrimitive primitive, int32_t* durationMs) { + std::vector<CompositePrimitive> supported; + getSupportedPrimitives(&supported); + if (std::find(supported.begin(), supported.end(), primitive) == supported.end()) { + return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); + } if (primitive != CompositePrimitive::NOOP) { *durationMs = 100; } else {