commit 53d72d1fe9add369b0dd35886e305d5d4ca30201
author Shuhei Miyazaki <Shuhei.Miyazaki@sony.com> Thu Aug 31 05:08:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 31 05:08:41 2017 +0000
tree 4a64dbaec5fb9e272b32b675b85b050ac0962d33
parent 3f644e74f0974bae8a95b5e3a7624f6ebebb197c
parent c986721b98341536b8f5cfd6f6f16ee4139faa30

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

Change-Id: If40a0218b9d648cd5af71ef56b37661a4c4ec2b9

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index e7c32e0..3ca3e64 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1278,9 +1278,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