diff options
author | Harpreet \"Eli\" Sangha <eliptus@google.com> | 2020-01-17 14:46:37 +0900 |
---|---|---|
committer | Harpreet "Eli" Sangha <eliptus@google.com> | 2020-01-27 07:20:10 +0000 |
commit | fe5d3986e9f170f6f0c04dbf9e40bcb5646922f9 (patch) | |
tree | 80f02335c4c68435a9b80cf27198da3359b6c15d /vibrator/aidl/default/Vibrator.cpp | |
parent | 523e29603b86253f68629d0bde3da1e34a9ad123 (diff) |
vibrator: Add "Light Tick" Primitive
Bug: 147844633
Test: adb shell idlcli vibrator compose 0 7 1.0
Change-Id: I208e56011f790c095afe734fd4326de10078525a
Merged-In: I208e56011f790c095afe734fd4326de10078525a
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
Diffstat (limited to 'vibrator/aidl/default/Vibrator.cpp')
-rw-r--r-- | vibrator/aidl/default/Vibrator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vibrator/aidl/default/Vibrator.cpp b/vibrator/aidl/default/Vibrator.cpp index d6ce8a1c43..0d7131aaf8 100644 --- a/vibrator/aidl/default/Vibrator.cpp +++ b/vibrator/aidl/default/Vibrator.cpp @@ -118,7 +118,7 @@ ndk::ScopedAStatus Vibrator::getSupportedPrimitives(std::vector<CompositePrimiti CompositePrimitive::NOOP, CompositePrimitive::CLICK, CompositePrimitive::THUD, CompositePrimitive::SPIN, CompositePrimitive::QUICK_RISE, CompositePrimitive::SLOW_RISE, - CompositePrimitive::QUICK_FALL, + CompositePrimitive::QUICK_FALL, CompositePrimitive::LIGHT_TICK, }; return ndk::ScopedAStatus::ok(); } @@ -147,7 +147,7 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect>& composi return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); } if (e.primitive < CompositePrimitive::NOOP || - e.primitive > CompositePrimitive::QUICK_FALL) { + e.primitive > CompositePrimitive::LIGHT_TICK) { return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); } } |