commit 943ab48116de0eab2e0501043ee0fb395ddc7cef
author Jack He <siyuanh@google.com> Wed Nov 09 16:06:34 2016 -0800
committer Jack He <siyuanh@google.com> Wed Mar 15 14:29:13 2017 -0700
tree 93214a849dfc36ab7698b295fa8feb06536f733e
parent 5bf75021706e526ab1d8afafc3ce992f8bc84196

Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute

* Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute so that BT
SCO will not be connected when call is accepted in Privacy Mode

Bug: 19171297
Test: mm -j 40, regression on HFP
Change-Id: I9221e90fc02001fbccf920e3253d77eceb2e5a22

src/com/android/server/telecom/CallAudioRouteStateMachine.java

diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
index 63bb6ab..dd69534 100644
--- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
@@ -823,8 +823,8 @@
                     }
                     return HANDLED;
                 case BT_AUDIO_DISCONNECT:
-                    // Ignore BT_AUDIO_DISCONNECT when ringing, since SCO audio should not be
-                    // connected.
+                    // BT SCO might be connected when in-band ringing is enabled
+                    sendInternalMessage(SWITCH_BASELINE_ROUTE);
                     return HANDLED;
                 default:
                     return NOT_HANDLED;