diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-23 21:55:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-23 21:55:28 +0000 |
| commit | d3038c30ef8436810cd1c2e5265eab00e242e765 (patch) | |
| tree | 57c52a314e69e36f519a37c5824872152603a40a | |
| parent | c41eb95cb0541a1e299e53cce9d1286145ea401c (diff) | |
| parent | c15c265676da2226a18a5373812608b19d4719d7 (diff) | |
| download | frameworks_av-d3038c30ef8436810cd1c2e5265eab00e242e765.zip frameworks_av-d3038c30ef8436810cd1c2e5265eab00e242e765.tar.gz frameworks_av-d3038c30ef8436810cd1c2e5265eab00e242e765.tar.bz2 | |
am c15c2656: audio policy: remove redundant fixed volume management
* commit 'c15c265676da2226a18a5373812608b19d4719d7':
audio policy: remove redundant fixed volume management
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index 8783ec9..e449863 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -4264,14 +4264,6 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, device = outputDesc->device(); } - // if volume is not 0 (not muted), force media volume to max on digital output - if (stream == AUDIO_STREAM_MUSIC && - index != mStreams[stream].mIndexMin && - (device == AUDIO_DEVICE_OUT_AUX_DIGITAL || - device == AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) { - return 1.0; - } - volume = volIndexToAmpl(device, streamDesc, index); // if a headset is connected, apply the following rules to ring tones and notifications |