commit 5ed0e558591f3c27aa1ba59d77d4e724ee11c064
author Christian Wailes <chriswailes@google.com> Tue Oct 29 22:13:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 29 22:13:06 2019 +0000
tree b3fcc8c4f8258a8a4abc2acdc63217bc2d893c93
parent e750b5b6595c5c5d1049b4ab8bdd65fc6d59a3f2
parent 7d716426ea921fe829e925937f0004aa0b0ed87e

Merge "Fixes a system crash in VibratorService on x86 hosts"

services/core/jni/com_android_server_VibratorService.cpp

diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp
index d5fbd2b..c59e605 100644
--- a/services/core/jni/com_android_server_VibratorService.cpp
+++ b/services/core/jni/com_android_server_VibratorService.cpp
@@ -151,7 +151,7 @@
     }
 }
 
-static jlong vibratorPerformEffect(JNIEnv*, jobject, jlong effect, jint strength) {
+static jlong vibratorPerformEffect(JNIEnv*, jobject, jlong effect, jlong strength) {
     Status status;
     uint32_t lengthMs;
     auto callback = [&status, &lengthMs](Status retStatus, uint32_t retLengthMs) {