From 75063d8474f9aecaab4a01a9e7bf5400a767ea14 Mon Sep 17 00:00:00 2001
From: Joshua Mccloskey <joshmccloskey@google.com>
Date: Wed, 30 Mar 2022 00:34:46 +0000
Subject: [PATCH] Added vibration back to UDFPS#onEnrollmentProgress

Test: Verified haptic is now present.
Bug: 222593183
Change-Id: I3aed905e127f4e3eff931e4e35f5929389764b7e
---
 .../fingerprint/FingerprintEnrollEnrolling.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index f41316a75c7..dfb4a347ec0 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -112,6 +112,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
     private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
             VibrationAttributes.createForUsage(VibrationAttributes.USAGE_ACCESSIBILITY);
 
+    private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES =
+            VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK);
+
+    private static final VibrationEffect SUCCESS_VIBRATION_EFFECT =
+            VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
+
     private FingerprintManager mFingerprintManager;
     private boolean mCanAssumeUdfps;
     @Nullable private ProgressBar mProgressBar;
@@ -509,6 +515,14 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
             mErrorText.removeCallbacks(mTouchAgainRunnable);
             mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
         } else {
+            if (mVibrator != null) {
+                mVibrator.vibrate(Process.myUid(),
+                        getApplicationContext().getOpPackageName(),
+                        SUCCESS_VIBRATION_EFFECT,
+                        getClass().getSimpleName() + "::OnEnrollmentProgressChanged",
+                        HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES);
+            }
+
             if (mIsAccessibilityEnabled) {
                 final int percent = (int) (((float)(steps - remaining) / (float) steps) * 100);
                 CharSequence cs = getString(
@@ -582,7 +596,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         }
         if (isResumed() && (mIsAccessibilityEnabled || !mCanAssumeUdfps)) {
             mVibrator.vibrate(Process.myUid(), getApplicationContext().getOpPackageName(),
-                    VIBRATE_EFFECT_ERROR, "FingerprintEnrollEnrolling:showError",
+                    VIBRATE_EFFECT_ERROR, getClass().getSimpleName() + "::showError",
                     FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
         }
     }