Merge "Volume: Don't allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev

2014-11-18 17:57:08 +00:00
parent 68235e4dbc 95ef08b348
commit ce66d35fc3
1 changed files with 2 additions and 2 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1827,8 +1827,8 @@ public class AudioService extends IAudioService.Stub {
                if (!isStreamAffectedByRingerMode(streamType) ||
                    ringerMode == AudioManager.RINGER_MODE_NORMAL) {
                    // ring and notifications volume should never be 0 when not silenced
-                    // on voice capable devices
-                    if (isPlatformVoice() &&
+                    // on voice capable devices or devices that support vibration
+                    if ((isPlatformVoice() || mHasVibrator) &&
                            mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING) {
                        synchronized (VolumeStreamState.class) {
                            Set set = mStreamStates[streamType].mIndex.entrySet();