Merge "Fix issue 5126270: Holding volume down vibrates"

1 files changed, 4 insertions, 0 deletions

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 179b8a45ad60..d4ab9277cb77 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -521,6 +521,10 @@ public class AudioService extends IAudioService.Stub {
              (!mVoiceCapable && streamType != AudioSystem.STREAM_VOICE_CALL &&
                streamType != AudioSystem.STREAM_BLUETOOTH_SCO) ||
                 (mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
+            //  do not vibrate if already in silent mode
+            if (mRingerMode != AudioManager.RINGER_MODE_NORMAL) {
+                flags &= ~AudioManager.FLAG_VIBRATE;
+            }
             // Check if the ringer mode changes with this volume adjustment. If
             // it does, it will handle adjusting the volume, so we won't below
             adjustVolume = checkForRingerModeChange(oldIndex, direction);