commit 6738af59c7dde7b437eb8e7fc28e2fdff3802aab
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 28 21:02:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 28 21:02:48 2021 +0000
tree 1781f231a083c9d5e3200f789f9031e43d924087
parent dc46322e5aab6a71ef066ee4a76d9c1801ac815f
parent 6d4c0482fc55d09a5523d38b31f0300b404f06b0

Merge "Fix default vibrator HAL to check support on getPrimitiveDuration"

vibrator/aidl/default/Vibrator.cpp

diff --git a/vibrator/aidl/default/Vibrator.cpp b/vibrator/aidl/default/Vibrator.cpp
index c446afd..322833b 100644
--- a/vibrator/aidl/default/Vibrator.cpp
+++ b/vibrator/aidl/default/Vibrator.cpp
@@ -125,6 +125,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 {