commit ea69bfb0f5b3fc247882355b919a3076e4992694
author Eric Laurent <elaurent@google.com> Mon Feb 25 16:58:20 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 25 16:58:20 2019 +0000
tree ed8db5eb87fdf16c30c9f47926c8c523150a3d86
parent 8c27e78fb1ea66b353f4e1162a6a1d253622506b
parent 3de3ee7025a84cbb1902c222b6d897414862c373

Merge changes from topic "policy_volume_emulator"

* changes:
  Revert "Revert "audiopolicy: engine: use apm XML config file for volume curves""
  Revert "Revert "audiopolicy: moves Stream Volume Curves to Engine""

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index fd6a013..f191738 100644
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -402,7 +402,9 @@
                     outputDeviceTypesToIgnore);
             break;
         }
-        if (device2 == AUDIO_DEVICE_NONE) {
+        // FIXME: Find a better solution to prevent routing to BT hearing aid(b/122931261).
+        if ((device2 == AUDIO_DEVICE_NONE) &&
+                (getForceUse(AUDIO_POLICY_FORCE_FOR_MEDIA) != AUDIO_POLICY_FORCE_NO_BT_A2DP)) {
             device2 = availableOutputDevicesType & AUDIO_DEVICE_OUT_HEARING_AID;
         }
         if ((device2 == AUDIO_DEVICE_NONE) &&