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

Commit 3db9cfcd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add support for chained steps to VibrationThread" into sc-dev

parents ffa06964 88abcd0d

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());