commit cca7e93111f4c160b7ee99e9a28c624b9e1fd773
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 18 13:43:45 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 18 13:43:45 2021 +0000
tree 57f3c24f7de3eae335c0abae9c5c4354d46dcfc4
parent c1d25eb84f03f65ab3501840747114e11e2d03c1
parent 3c7f0d90bac9ef33c4f43710374ce5c8fc3ca96f

Merge "Fix default vibrator HAL to check support on getPrimitiveDuration" into sc-dev

vibrator/aidl/default/Vibrator.cpp

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 {