commit c4a226e8584b3d87c2503ddfcde336f63e7c6487
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 31 04:10:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 31 04:10:48 2017 +0000
tree aa162aa0c6c3b9d819f7ca7c7807762fc39368b0
parent aba0e98b085cc613003bf42dbfe1ad0a3bb2348e
parent 6fe70331b17a513765153afd7f895f807518bb91

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

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 78f195d..a16b123 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1320,9 +1320,9 @@
 
         // 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