From: Alexey Kuzmin <alexeykuzmin@google.com>
Date: Mon, 16 Jul 2018 21:37:46 +0000 (+0100)
Subject: Add a reason field to vibrator service
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee2f899a8bd6ba324be5da04259fe8d16d97bda2;p=android-x86%2Fpackages-apps-Settings.git

Add a reason field to vibrator service

Test: Run vibration test, see reason written to log and trace
Bug: 109654229
Change-Id: I5dbe9a5ff666535f02b5606f18438255ec8a50e8
---

diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index bee208fb71..da91a1dae5 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -106,6 +106,7 @@ public class FingerprintEnrollEnrollingTest {
                 anyInt(),
                 nullable(String.class),
                 any(VibrationEffect.class),
+                nullable(String.class),
                 nullable(AudioAttributes.class));
     }
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
index 9046720930..69e08d5cf0 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
@@ -50,7 +50,8 @@ public class ShadowVibrator {
     public final Vibrator delegate = mock(Vibrator.class);
 
     @Implementation
-    public void vibrate(int uid, String opPkg, VibrationEffect vibe, AudioAttributes attributes) {
-        delegate.vibrate(uid, opPkg, vibe, attributes);
+    public void vibrate(int uid, String opPkg, VibrationEffect vibe, String reason,
+            AudioAttributes attributes) {
+        delegate.vibrate(uid, opPkg, vibe, reason, attributes);
     }
 }