PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a reason field to vibrator service"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-08-07 19:42:58 +00:00
committed by Android (Google) Code Review
parent b9b4a68862 ee2f899a8b
commit 4453a60c17
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
View File

@@ -106,6 +106,7 @@ public class FingerprintEnrollEnrollingTest {
anyInt(), anyInt(),
nullable(String.class), nullable(String.class),
any(VibrationEffect.class), any(VibrationEffect.class),
nullable(String.class),
nullable(AudioAttributes.class)); nullable(AudioAttributes.class));
} }

5
tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
View File

@@ -50,7 +50,8 @@ public class ShadowVibrator {
public final Vibrator delegate = mock(Vibrator.class); public final Vibrator delegate = mock(Vibrator.class);
@Implementation @Implementation
public void vibrate(int uid, String opPkg, VibrationEffect vibe, AudioAttributes attributes) { public void vibrate(int uid, String opPkg, VibrationEffect vibe, String reason,
delegate.vibrate(uid, opPkg, vibe, attributes); AudioAttributes attributes) {
delegate.vibrate(uid, opPkg, vibe, reason, attributes);
} }
} }