summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alexey Kuzmin <alexeykuzmin@google.com> 2019-06-04 16:50:03 +0100
committer Alexey Kuzmin <alexeykuzmin@google.com> 2019-06-05 12:16:34 +0000
commitac7acf5307df26f4be57b74edc0f770f7224a09c (patch)
tree5a1c2638afbfac877777210ce9157eb78774ff39
parent4fd5870662114abcb917791cca088bc6de7ae630 (diff)
Revert "Change attrbute of double-power-to-camera vibration"
This reverts commit 648bd1151f115b29a73adcd51ad7c7c1a61f2e96. Bug: 123870990 Test: no changes Change-Id: I02204bfccb4a305f1d4b841fe79a2bdc1aa1182d
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java13
1 files changed, 1 insertions, 12 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 05a23fa49922..084c1d2b23ed 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -320,17 +320,6 @@ public class StatusBar extends SystemUI implements DemoMode,
/** If true, the lockscreen will show a distinct wallpaper */
public static final boolean ENABLE_LOCKSCREEN_WALLPAPER = true;
- private static final AudioAttributes AUDIO_ATTRIBUTES =
- new AudioAttributes.Builder()
- .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
- // Temporary fix for b/123870990. No time in this release to
- // introduce a new vibration type, but we need to distinguish these vibrations
- // from other haptic feedback vibrations. Fortunately, Alarm vibrations have
- // exactly the same behavior as we need
- // TODO: refactor within the scope of b/132170758
- .setUsage(AudioAttributes.USAGE_ALARM)
- .build();
-
static {
boolean onlyCoreApps;
try {
@@ -3710,7 +3699,7 @@ public class StatusBar extends SystemUI implements DemoMode,
private void vibrateForCameraGesture() {
// Make sure to pass -1 for repeat so VibratorService doesn't stop us when going to sleep.
- mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */, AUDIO_ATTRIBUTES);
+ mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */);
}
/**