From 7d78fea1f593f46405a428bd83179c0d05af2090 Mon Sep 17 00:00:00 2001
From: Chris Ye <lzye@google.com>
Date: Mon, 5 Apr 2021 17:31:11 -0700
Subject: [PATCH] Fixed input device vibrator manager with single vibrator in
 CombinedEffects.

Fixed the input device vibrator manager to handle the combined vibration effect contains only one vibrator ID.

Bug: 184584308
Test: atest InputDeviceVibratorManagerTest
Change-Id: Id19af5e0094a7ec2fff057e93ab51ae975633163
---
 .../core/jni/com_android_server_input_InputManagerService.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 3a674c4d7ee56..3ee2b8dd57d29 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -1920,7 +1920,7 @@ static void nativeVibrateCombined(JNIEnv* env, jclass /* clazz */, jlong ptr, ji
         // VibrationEffect.validate guarantees duration > 0.
         std::chrono::milliseconds duration(patternMillis[i]);
         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],
                                static_cast<uint8_t>(amplitudesArray[channel][i]));
         }