From 6d4c0482fc55d09a5523d38b31f0300b404f06b0 Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Wed, 16 Jun 2021 10:20:09 +0000
Subject: [PATCH] Fix default vibrator HAL to check support on
 getPrimitiveDuration

Change-Id: I09219cca0a1b0bb985cae70734b0dd03cca441fc
Merged-In: I09219cca0a1b0bb985cae70734b0dd03cca441fc
Fix: 191115802
Fix: 191952216
Test: VtsHalVibratorTargetTest
---
 vibrator/aidl/default/Vibrator.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vibrator/aidl/default/Vibrator.cpp b/vibrator/aidl/default/Vibrator.cpp
index c446afdea8..322833b395 100644
--- a/vibrator/aidl/default/Vibrator.cpp
+++ b/vibrator/aidl/default/Vibrator.cpp
@@ -125,6 +125,11 @@ ndk::ScopedAStatus Vibrator::getSupportedPrimitives(std::vector<CompositePrimiti
 
 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 {