commit a399d331fb7565b5e245ecd9985dacfd1137360d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 29 23:54:06 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 23:54:06 2020 +0000
tree 4158c0202e18e25c02ef366aaf02e35fd63c1ce5
parent 66d9a93a7186e2b21a553349f04aac2a994d4f0f
parent 13ef28c6a4bf724bb8e2073ca9c61d238b4c6fe9

Merge "vibrator: Deduplicate Supported Primitives Check"

vibrator/aidl/default/Vibrator.cpp

diff --git a/vibrator/aidl/default/Vibrator.cpp b/vibrator/aidl/default/Vibrator.cpp
index 0d7131a..9236b95 100644
--- a/vibrator/aidl/default/Vibrator.cpp
+++ b/vibrator/aidl/default/Vibrator.cpp
@@ -139,6 +139,9 @@
         return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
     }
 
+    std::vector<CompositePrimitive> supported;
+    getSupportedPrimitives(&supported);
+
     for (auto& e : composite) {
         if (e.delayMs > kComposeDelayMaxMs) {
             return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
@@ -146,8 +149,7 @@
         if (e.scale <= 0.0f || e.scale > 1.0f) {
             return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
         }
-        if (e.primitive < CompositePrimitive::NOOP ||
-            e.primitive > CompositePrimitive::LIGHT_TICK) {
+        if (std::find(supported.begin(), supported.end(), e.primitive) == supported.end()) {
             return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
         }
     }