summaryrefslogtreecommitdiffstats
path: root/audio/AudioPolicyManagerBase.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-07-15 17:26:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-15 17:26:21 -0700
commitae57fbe12a00c9705cdc77bf6e688ca9b36d3871 (patch)
treec9e03bc5c02880752355b809015eeaba9ba50f46 /audio/AudioPolicyManagerBase.cpp
parent41d40cfaa6e7907d0a75c17dce8787fa172b57e0 (diff)
parent8e7e42547116b1d5f49118ba41946b2906ad3936 (diff)
downloadhardware_libhardware_legacy-ae57fbe12a00c9705cdc77bf6e688ca9b36d3871.zip
hardware_libhardware_legacy-ae57fbe12a00c9705cdc77bf6e688ca9b36d3871.tar.gz
hardware_libhardware_legacy-ae57fbe12a00c9705cdc77bf6e688ca9b36d3871.tar.bz2
am 8e7e4254: am e92d6238: audio policy: apply default device volume
* commit '8e7e42547116b1d5f49118ba41946b2906ad3936': audio policy: apply default device volume
Diffstat (limited to 'audio/AudioPolicyManagerBase.cpp')
-rw-r--r--audio/AudioPolicyManagerBase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 176b631..e6e498f 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -1039,7 +1039,7 @@ status_t AudioPolicyManagerBase::setStreamVolumeIndex(AudioSystem::stream_type s
for (size_t i = 0; i < mOutputs.size(); i++) {
audio_devices_t curDevice =
getDeviceForVolume(mOutputs.valueAt(i)->device());
- if (device == curDevice) {
+ if ((device == AUDIO_DEVICE_OUT_DEFAULT) || (device == curDevice)) {
status_t volStatus = checkAndSetVolume(stream, index, mOutputs.keyAt(i), curDevice);
if (volStatus != NO_ERROR) {
status = volStatus;