Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed input device vibrator manager with single vibrator in CombinedEffects." into sc-dev

Browse Source
This commit is contained in:
Chris Ye
2021-04-06 16:47:38 +00:00
committed by Android (Google) Code Review
parent 54c39c71a9 7d78fea1f5
commit f0ee658a51
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -1920,7 +1920,7 @@ static void nativeVibrateCombined(JNIEnv* env, jclass /* clazz */, jlong ptr, ji
// VibrationEffect.validate guarantees duration > 0. // VibrationEffect.validate guarantees duration > 0.
std::chrono::milliseconds duration(patternMillis[i]); std::chrono::milliseconds duration(patternMillis[i]);
element.duration = std::min(duration, MAX_VIBRATE_PATTERN_DELAY_MILLIS); element.duration = std::min(duration, MAX_VIBRATE_PATTERN_DELAY_MILLIS);
for (int32_t channel = 0; channel < CHANNEL_SIZE; channel++) { for (int32_t channel = 0; channel < amplSize; channel++) {
element.addChannel(vibratorIdArray[channel], element.addChannel(vibratorIdArray[channel],
static_cast<uint8_t>(amplitudesArray[channel][i])); static_cast<uint8_t>(amplitudesArray[channel][i]));
} }