diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-22 19:48:16 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-07-23 21:11:19 +0000 |
| commit | c15c265676da2226a18a5373812608b19d4719d7 (patch) | |
| tree | d2d97a46c7ff6420789ebb62a1da4941dadb119c | |
| parent | db2225b2a24fa4ade5c0353730dc2d6a2f5838d9 (diff) | |
| download | frameworks_av-c15c265676da2226a18a5373812608b19d4719d7.zip frameworks_av-c15c265676da2226a18a5373812608b19d4719d7.tar.gz frameworks_av-c15c265676da2226a18a5373812608b19d4719d7.tar.bz2 | |
audio policy: remove redundant fixed volume management
Remove code handling fixed device volume in
AudioPolicyManager::computeVolume() as this is already
managed by AudioService.
Change-Id: Ib2be7578e40652c85a7d44c685ff9cc703d0c969
| -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 |