summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorPaul McLean <pmclean@google.com>2014-06-26 13:16:44 -0700
committerPaul McLean <pmclean@google.com>2014-06-26 15:25:59 -0700
commitb919dd3334fed73e16ebac7b7e10cf2add34c338 (patch)
tree412879f22058e60bbc4e4e5ff935152bb95f193d /services
parent1760291cf87005f18605a32a35aed9cae09988f7 (diff)
downloadframeworks_av-b919dd3334fed73e16ebac7b7e10cf2add34c338.zip
frameworks_av-b919dd3334fed73e16ebac7b7e10cf2add34c338.tar.gz
frameworks_av-b919dd3334fed73e16ebac7b7e10cf2add34c338.tar.bz2
Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output
Bug: 13747844 Change-Id: Ied5bb44f63a4e7183c52f8111e9a389b60ffe75f
Diffstat (limited to 'services')
-rw-r--r--services/audiopolicy/AudioPolicyManager.cpp4
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;
}