diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-07-09 01:26:20 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2017-07-09 01:26:20 -0700 |
| commit | 23d91de4b60b21c2f68232aa6351bd1ccf500cc9 (patch) | |
| tree | 3cc561b274af2cc987b1c8504046d0c204dd7981 | |
| parent | 3b4fef61e3a1eabed9828ef23fa6825480988d70 (diff) | |
| parent | 69af59b8962261e89d3309fd17b28425a3c0170f (diff) | |
| download | hardware_qcom_audio-23d91de4b60b21c2f68232aa6351bd1ccf500cc9.tar.gz hardware_qcom_audio-23d91de4b60b21c2f68232aa6351bd1ccf500cc9.tar.bz2 hardware_qcom_audio-23d91de4b60b21c2f68232aa6351bd1ccf500cc9.zip | |
Merge 69af59b8962261e89d3309fd17b28425a3c0170f on remote branch
Change-Id: Ic6ab2790e2e542d237b29dd5d474972aeac7c6e9
| -rw-r--r-- | policy_hal/AudioPolicyManager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp index 5742dcdd..f8ff0059 100644 --- a/policy_hal/AudioPolicyManager.cpp +++ b/policy_hal/AudioPolicyManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. * Not a contribution. * * Copyright (C) 2009 The Android Open Source Project @@ -1086,6 +1086,11 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe dev, force, delayMs); + // re-apply device specific volume if not done by setOutputDevice() + if (!force) { + applyStreamVolumes(desc, dev, delayMs); + } + } } // update the outputs if stopping one with a stream that can affect notification routing |