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

Commit a14d219c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix VibratorManagerServiceTest test on adaptive haptics disabled" into main

parents e9af6f6f ec983f94

services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java

+2 −4
Original line number Diff line number Diff line
@@ -2108,9 +2108,6 @@ public class VibratorManagerServiceTest { 


        assertEquals(scale.adaptiveHapticsScale, 1f, 0);



        mVibratorControlService.setVibrationParams(

                VibrationParamGenerator.generateVibrationParams(vibrationScales),

                mFakeVibratorController);

        externalVibration = new ExternalVibration(UID, PACKAGE_NAME,

                AUDIO_NOTIFICATION_ATTRS,

                mock(IExternalVibrationController.class));
@@ -2118,7 +2115,8 @@ public class VibratorManagerServiceTest { 
        mExternalVibratorService.onExternalVibrationStop(externalVibration);



        assertEquals(scale.adaptiveHapticsScale, 1f, 0);

        verify(mVibratorFrameworkStatsLoggerMock).logVibrationAdaptiveHapticScale(UID, 1f);

        verify(mVibratorFrameworkStatsLoggerMock, times(2))

                .logVibrationAdaptiveHapticScale(UID, 1f);

    }



    @Test