summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ahmad Khalil <khalilahmad@google.com> 2025-01-18 22:30:21 +0000
committer Ahmad Khalil <khalilahmad@google.com> 2025-01-20 17:06:18 +0000
commit446eea05ebb6af37a596aa86d59691b41a33012a (patch)
tree502bfca8115490728f62e11141ab45236043b8a7
parenta39afd3f941b6b8aed971a0367e740b7840cc4ff (diff)
Fix PWLE v2 effect durations
The `VibratorController` now accurately returns the total duration of PWLE v2 vibrations. Bug: 390701627 Flag: android.os.vibrator.normalized_pwle_effects Test: manual testing Change-Id: Ic9afd3dba4ad8b4d51d3caeab09296054eb8fc0e
-rw-r--r--services/core/jni/com_android_server_vibrator_VibratorController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/jni/com_android_server_vibrator_VibratorController.cpp b/services/core/jni/com_android_server_vibrator_VibratorController.cpp
index 0ecc0a8a9524..abd4cd25cf68 100644
--- a/services/core/jni/com_android_server_vibrator_VibratorController.cpp
+++ b/services/core/jni/com_android_server_vibrator_VibratorController.cpp
@@ -435,8 +435,8 @@ static jlong vibratorPerformPwleV2Effect(JNIEnv* env, jclass /* clazz */, jlong
auto composePwleV2Fn = [&composite, &callback](vibrator::HalWrapper* hal) {
return hal->composePwleV2(composite, callback);
};
- auto result = wrapper->halCall<void>(composePwleV2Fn, "composePwleV2");
- return result.isOk();
+ auto result = wrapper->halCall<std::chrono::milliseconds>(composePwleV2Fn, "composePwleV2");
+ return result.isOk() ? result.value().count() : (result.isUnsupported() ? 0 : -1);
}
static void vibratorAlwaysOnEnable(JNIEnv* env, jclass /* clazz */, jlong ptr, jlong id,