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

Commit 88abcd0d authored by Lais Andrade's avatar Lais Andrade
Browse files

Add support for chained steps to VibrationThread 

Change the design of VibrationThread to allow all steps to be played
in a chain. Replace the generation of a predefined list of steps to
represent a combined effect by a design where each step played adds
the next ones to the queue.

This new approach will be necessary to allow mixing and chaining steps
to play composed and waveform effects, which will be required by the
PWLE waveform support.

Bug: 167947076
Test: VibratonThreadTest
Change-Id: I664f7477f7720af14fed963fa479ba38298a027c
parent 8d90f15a

services/core/java/com/android/server/vibrator/VibrationThread.java

+586 −567

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java

+6 −4
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ public class VibrationThreadTest { 
        waitForCompletion(thread);



        verify(mControllerCallbacks, never()).onComplete(anyInt(), eq(vibrationId));

        verify(mThreadCallbacks).onVibrationEnded(eq(vibrationId), eq(Vibration.Status.IGNORED));

        verify(mThreadCallbacks).onVibrationEnded(eq(vibrationId),

                eq(Vibration.Status.IGNORED_UNSUPPORTED));

    }



    @Test
@@ -121,7 +122,8 @@ public class VibrationThreadTest { 
        waitForCompletion(thread);



        verify(mControllerCallbacks, never()).onComplete(anyInt(), eq(vibrationId));

        verify(mThreadCallbacks).onVibrationEnded(eq(vibrationId), eq(Vibration.Status.IGNORED));

        verify(mThreadCallbacks).onVibrationEnded(eq(vibrationId),

                eq(Vibration.Status.IGNORED_UNSUPPORTED));

    }



    @Test
@@ -206,8 +208,8 @@ public class VibrationThreadTest { 
        thread.cancel();

        waitForCompletion(thread);



        verify(mIBatteryStatsMock, never()).noteVibratorOn(eq(UID), anyLong());

        verify(mIBatteryStatsMock, never()).noteVibratorOff(eq(UID));

        verify(mIBatteryStatsMock).noteVibratorOn(eq(UID), anyLong());

        verify(mIBatteryStatsMock).noteVibratorOff(eq(UID));

        verify(mThreadCallbacks).onVibrationEnded(eq(vibrationId), eq(Vibration.Status.CANCELLED));

        assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating());