From b166fcedace194a212fc7f35bfd2adcbf29d3d72 Mon Sep 17 00:00:00 2001 From: hupengcheng Date: Sat, 11 Dec 2021 14:25:39 +0800 Subject: [PATCH] Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest For dual vibrator device, the AOSP code needs to be adjusted as follow. Bug: 209932477 Test: run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateComposed run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorIsVibrating run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateMultiThread run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorVibratesNoLongerThanDuration run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateOneShot run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorStateCallback run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratePattern run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratePredefined run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateWaveform run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorCancel Change-Id: I31afc8179acb4f7749b1208f3abd13a1941a01b2 --- core/java/android/os/SystemVibrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/os/SystemVibrator.java b/core/java/android/os/SystemVibrator.java index 0c3debb1b54ec..26de7112a8b57 100644 --- a/core/java/android/os/SystemVibrator.java +++ b/core/java/android/os/SystemVibrator.java @@ -389,7 +389,7 @@ public class SystemVibrator extends Vibrator { mExecutor.execute(() -> { boolean anyVibrating; synchronized (mLock) { - int allInitializedMask = 1 << mVibratorListeners.size() - 1; + int allInitializedMask = (1 << mVibratorListeners.size()) - 1; int vibratorMask = 1 << vibratorIdx; if ((mInitializedMask & vibratorMask) == 0) { // First state report for this vibrator, set vibrating initial value.