summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2019-11-27 06:43:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-11-27 06:43:42 +0000
commit081e49f2762fc3342551874b2b8a79aaa98c8c42 (patch)
tree9237f1e8b16eb5451a045120a5a903427fc9b165
parentda3518bc6bd66b7057a00b2b4b06de31f56399b0 (diff)
parent742baf8e27c2832185b6f2f1efa703947fc096ca (diff)
Merge "VibratorService: AIDL Amplitude API Change"
-rw-r--r--services/core/jni/com_android_server_VibratorService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp
index 746610df11ae..612a1e7074f9 100644
--- a/services/core/jni/com_android_server_VibratorService.cpp
+++ b/services/core/jni/com_android_server_VibratorService.cpp
@@ -291,7 +291,7 @@ static jlong vibratorSupportsAmplitudeControl(JNIEnv*, jclass) {
static void vibratorSetAmplitude(JNIEnv*, jclass, jint amplitude) {
if (auto hal = getHal<aidl::IVibrator>()) {
- auto status = hal->call(&aidl::IVibrator::IVibrator::setAmplitude, amplitude);
+ auto status = hal->call(&aidl::IVibrator::IVibrator::setAmplitude, static_cast<float>(amplitude) / UINT8_MAX);
if (!status.isOk()) {
ALOGE("Failed to set vibrator amplitude: %s", status.toString8().string());
}