Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b66cf5d authored by Chris Ye's avatar Chris Ye Committed by Automerger Merge Worker
Browse files

Merge "Fixed input device vibrator manager with single vibrator in... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14095812

Change-Id: Ied0342d8d2789f65aa4768b957151c7d6a73e77a
parents 40683b71 f0ee658a

services/core/jni/com_android_server_input_InputManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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]));

        }