commit cdf738e37397def04c2418406ca46da4cf3d7380
author Eric Laurent <elaurent@google.com> Mon Aug 10 18:15:36 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 10 18:15:36 2020 +0000
tree b1932b1bd26afdcad7783ad23806c23b69ba3bf0
parent a42085c0ef9841d360eb423f7873e096ced2865d
parent 23b282c9f9a7dacb0cc9000940c755a21970f1b6

Merge "Fix music output to speaker" am: fc9e26a3e9 am: af034fc9cb am: 23b282c9f9

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1360120

Change-Id: I6296d6dd227058a728f9a4718b198bba9756e019

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 1fe340a..7f4a526 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -462,7 +462,16 @@
             }
         }
     }
-
+    auto musicStrategy = streamToStrategy(AUDIO_STREAM_MUSIC);
+    for (size_t i = 0; i < mOutputs.size(); i++) {
+       sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);
+       // mute media strategies and delay device switch by the largest
+       // This avoid sending the music tail into the earpiece or headset.
+       setStrategyMute(musicStrategy, true, desc);
+       setStrategyMute(musicStrategy, false, desc, MUTE_TIME_MS,
+          mEngine->getOutputDevicesForAttributes(attributes_initializer(AUDIO_USAGE_MEDIA),
+                                              nullptr, true /*fromCache*/).types());
+    }
     // Toggle the device state: UNAVAILABLE -> AVAILABLE
     // This will force reading again the device configuration
     status = setDeviceConnectionState(device,