Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-15 13:24:49 +00:00
committed by Android (Google) Code Review
parent ffa06964b1 88abcd0d56
commit 3db9cfcd38
2 changed files with 621 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1211
services/core/java/com/android/server/vibrator/VibrationThread.java
View File

File diff suppressed because it is too large Load Diff

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

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