summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorPaul McLean <pmclean@google.com>2014-06-26 15:38:35 -0700
committerPaul McLean <pmclean@google.com>2014-06-27 08:48:20 -0700
commit03d92f4a6ec954cfa81765f00c1784e2c2ff2f49 (patch)
tree729cf05bb909ee66944a12484394f2d7dcc616d4 /audio
parent629b95b3e81e8176f3276a925a743885cd9e8ae0 (diff)
downloadhardware_libhardware_legacy-03d92f4a6ec954cfa81765f00c1784e2c2ff2f49.zip
hardware_libhardware_legacy-03d92f4a6ec954cfa81765f00c1784e2c2ff2f49.tar.gz
hardware_libhardware_legacy-03d92f4a6ec954cfa81765f00c1784e2c2ff2f49.tar.bz2
Enabling USB Device and Android Device Vol inc/dec functionality
for USB Audio Output Bug: 13747844 Change-Id: I53b7db8102fd2ed24014c338ea5e7290cda8b2f3
Diffstat (limited to 'audio')
-rw-r--r--audio/AudioPolicyManagerBase.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 1a9f441..1d49abb 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -3222,9 +3222,7 @@ float AudioPolicyManagerBase::computeVolume(int stream,
if (stream == AudioSystem::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;
}