commit f81362f6cd1bb22f988c30e6b552e6a2d95c4de7
author Eric Laurent <elaurent@google.com> Fri Jul 08 15:40:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 08 15:40:32 2016 +0000
tree ef22a575a99d6b6348da7bdb74d7d7af828b008c
parent 65f40e3a257e48f6acd625df68dcfdf3ce4faf0c
parent 447a87bbfe11cc85123ddd94551c3a5ede54ea20

Merge "AudioPolicyManager: fix music volume following alarm" into nyc-mr1-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 3b075fa..0e64716 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4375,7 +4375,7 @@
         }
         routing_strategy curStrategy = getStrategy((audio_stream_type_t)curStream);
         audio_devices_t curDevices =
-                getDeviceForStrategy((routing_strategy)curStrategy, true /*fromCache*/);
+                getDeviceForStrategy((routing_strategy)curStrategy, false /*fromCache*/);
         SortedVector<audio_io_handle_t> outputs = getOutputsForDevice(curDevices, mOutputs);
         for (size_t i = 0; i < outputs.size(); i++) {
             sp<AudioOutputDescriptor> outputDesc = mOutputs.valueFor(outputs[i]);