From ac7acf5307df26f4be57b74edc0f770f7224a09c Mon Sep 17 00:00:00 2001 From: Alexey Kuzmin Date: Tue, 4 Jun 2019 16:50:03 +0100 Subject: [PATCH] Revert "Change attrbute of double-power-to-camera vibration" This reverts commit 648bd1151f115b29a73adcd51ad7c7c1a61f2e96. Bug: 123870990 Test: no changes Change-Id: I02204bfccb4a305f1d4b841fe79a2bdc1aa1182d --- .../android/systemui/statusbar/phone/StatusBar.java | 13 +------------ 1 file changed, 1 insertion(+), 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 05a23fa49922b..084c1d2b23ed2 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 */); } /**