summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Harpreet \"Eli\" Sangha <eliptus@google.com> 2019-11-26 22:48:12 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-26 22:48:12 -0800
commita08ce9719c8bca3043fccdbc167e852754393b84 (patch)
treea6f5853ff4f65ddf7fc5756c03c14745e17ba33a
parent1381de466aa0f04a8bd125272faef05144ad82b1 (diff)
parent081e49f2762fc3342551874b2b8a79aaa98c8c42 (diff)
Merge "VibratorService: AIDL Amplitude API Change"
am: 081e49f276 Change-Id: I4c7b7e1056833095b3bb8f7e3f7e472ddc2962e1
-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());
}