Merge "Set output volume for routing device in startSource()" into oc-mr1-dev

7 years ago · c4a226e858
parent aba0e98b08 6fe70331b1
commit c4a226e858
1 changed files with 2 additions and 2 deletions
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@ -1320,9 +1320,9 @@ status_t AudioPolicyManager::startSource(const sp<AudioOutputDescriptor>& output

        // apply volume rules for current stream and device if necessary
        checkAndSetVolume(stream,
-                          mVolumeCurves->getVolumeIndex(stream, device),
+                          mVolumeCurves->getVolumeIndex(stream, outputDesc->device()),
                          outputDesc,
-                          device);
+                          outputDesc->device());

        // update the outputs if starting an output with a stream that can affect notification
        // routing