| commit | c55f6b46e0709de86263ec29c6006ed8d30b9b9b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 28 21:25:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 28 21:25:44 2021 +0000 |
| tree | 1781f231a083c9d5e3200f789f9031e43d924087 | |
| parent | a43ffc127883bb43d9d9c3b9f06c3ac19b72e408 [diff] | |
| parent | 6738af59c7dde7b437eb8e7fc28e2fdff3802aab [diff] |
Merge "Fix default vibrator HAL to check support on getPrimitiveDuration" am: 6738af59c7 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1748636 Change-Id: If4776ba2e09b282096c651d41607fc8e898a1578
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 {