commit a2f237122410a75471fa2e2d236bf1d3edc43e53
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 21 18:44:56 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 21 18:44:56 2018 +0000
tree c482e308fc34c0c952d454db423f814636f855b2
parent d17e849775431302aca12cacc64463d9406e6f9d
parent 2bf96d9bf9f5260f75d4b0d3dcf67250ebf4d3a7

Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev

src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 756f826..d89226c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -30,6 +30,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.hardware.fingerprint.FingerprintManager;
+import android.media.AudioAttributes;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.VibrationEffect;
@@ -78,6 +79,11 @@
 
     private static final VibrationEffect VIBRATE_EFFECT_ERROR =
             VibrationEffect.createWaveform(new long[] {0, 5, 55, 60}, -1);
+    private static final AudioAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
+            new AudioAttributes.Builder()
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+                    .build();
 
     private ProgressBar mProgressBar;
     private ObjectAnimator mProgressAnim;
@@ -376,7 +382,7 @@
             mErrorText.setTranslationY(0f);
         }
         if (isResumed()) {
-            mVibrator.vibrate(VIBRATE_EFFECT_ERROR);
+            mVibrator.vibrate(VIBRATE_EFFECT_ERROR, FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
         }
     }