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

Commit ec1801d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t... 

Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" am: c9ed425d am: 1b148ed1 am: 130599d1 am: 15ccd2c5

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

Change-Id: I8ca688eaeb2f3f4a34a5bcffa40fca88051e341c
parents 2732b610 15ccd2c5

core/java/android/os/SystemVibrator.java

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,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.