drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ce66d35fc37ce7b0630281cbc364ac8b05cf7b85':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
This commit is contained in:
John Spurlock
2014-11-18 18:01:58 +00:00
committed by Android Git Automerger
parent 8b9df16f2d ce66d35fc3
commit 313ec49f32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/AudioService.java
View File

@ -1827,8 +1827,8 @@ public class AudioService extends IAudioService.Stub {
if (!isStreamAffectedByRingerMode(streamType) || if (!isStreamAffectedByRingerMode(streamType) ||
ringerMode == AudioManager.RINGER_MODE_NORMAL) { ringerMode == AudioManager.RINGER_MODE_NORMAL) {
// ring and notifications volume should never be 0 when not silenced // ring and notifications volume should never be 0 when not silenced
// on voice capable devices // on voice capable devices or devices that support vibration
if (isPlatformVoice() && if ((isPlatformVoice() || mHasVibrator) &&
mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING) { mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING) {
synchronized (VolumeStreamState.class) { synchronized (VolumeStreamState.class) {
Set set = mStreamStates[streamType].mIndex.entrySet(); Set set = mStreamStates[streamType].mIndex.entrySet();