diff options
| author | Paul McLean <pmclean@google.com> | 2014-06-27 16:05:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-26 18:07:29 +0000 |
| commit | 7b428d51a711b493090a2be4d27699215761a64e (patch) | |
| tree | 02ff3fe52761e1ddd0918ac90759c9c0a4ded684 /services | |
| parent | e8f2c6cfe9afc5b303ab6b0fb51e18ddce512b54 (diff) | |
| parent | b919dd3334fed73e16ebac7b7e10cf2add34c338 (diff) | |
| download | frameworks_av-7b428d51a711b493090a2be4d27699215761a64e.zip frameworks_av-7b428d51a711b493090a2be4d27699215761a64e.tar.gz frameworks_av-7b428d51a711b493090a2be4d27699215761a64e.tar.bz2 | |
Merge "Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index ee02516..4fcf43b 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -4218,9 +4218,7 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, if (stream == AUDIO_STREAM_MUSIC && index != mStreams[stream].mIndexMin && (device == AUDIO_DEVICE_OUT_AUX_DIGITAL || - device == AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET || - device == AUDIO_DEVICE_OUT_USB_ACCESSORY || - device == AUDIO_DEVICE_OUT_USB_DEVICE)) { + device == AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) { return 1.0; } |