commit 56438136f71f4be548ddeed66c99d77e776d56a3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 31 16:12:36 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 31 16:12:36 2020 +0000
tree 5030df783d8ac4fb590aab142231c43a581e3461
parent 7fea784edede0e77f4e5ced29182fba8298bc9f2
parent a399d331fb7565b5e245ecd9985dacfd1137360d

Merge "vibrator: Deduplicate Supported Primitives Check" am: a399d331fb

Change-Id: Id65756d89a0a08691aefd5652b5f70205fa2121d

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);
         }
     }