diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2016-12-09 13:08:00 +0100 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2016-12-09 13:08:36 +0100 |
| commit | 9c27ca13da3f598dbbaba6e9c90965f27436cd8a (patch) | |
| tree | fff7962c8b7dbcf067cb9baf58785605fbe6eef5 | |
| parent | 5dc527044cfd9b8a21d0cf912581536bd2c55f4b (diff) | |
| download | hardware_qcom_audio-9c27ca13da3f598dbbaba6e9c90965f27436cd8a.tar.gz hardware_qcom_audio-9c27ca13da3f598dbbaba6e9c90965f27436cd8a.tar.bz2 hardware_qcom_audio-9c27ca13da3f598dbbaba6e9c90965f27436cd8a.zip | |
policy_hal: Fix mismerges
Change-Id: I19344f9ab589e5e6896888a937bed51174e3fa1d
| -rw-r--r-- | policy_hal/AudioPolicyManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp index 5e39d487..60f7d929 100644 --- a/policy_hal/AudioPolicyManager.cpp +++ b/policy_hal/AudioPolicyManager.cpp @@ -793,7 +793,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe delayMs); // re-apply device specific volume if not done by setOutputDevice() if (!force) { - applyStreamVolumes(desc, newDevice, delayMs); + applyStreamVolumes(desc, dev, delayMs); } } } |