commit 4ac7625dc53414923014b3d1c7cfd7d1e7ceaeb9
author Satish Kodishala <skodisha@codeaurora.org> Wed Jul 29 23:05:13 2020 +0530
committer Satish Kodishala <skodisha@codeaurora.org> Thu Aug 06 18:30:11 2020 +0530
tree 8d4bf0c69c190eada7cd7093bed09066773aa015
parent c27487819eed5c4a2d3ab43fe00d40c182d5629c

Update SCO disconnection to MM audio early.

Update SCO disconnection to MM audio early.
This would help in quick switching between
SCO to A2DP.

CRs-Fixed: 2749595
Change-Id: I44d95bf8d90e652eff1eb6cbddf0accf78113551

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 9c0e9db..8f44525 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -1372,6 +1372,7 @@
                 // devices that previously successfully connected.
                 removeDeferredMessages(CONNECT);
             }
+            broadcastStateTransitions();
             if ((mPrevState == mAudioOn) || (mPrevState == mAudioDisconnecting)||
                  (mPrevState == mAudioConnecting)) {
                 if (!(mSystemInterface.isInCall() || mSystemInterface.isRinging())) {
@@ -1380,7 +1381,6 @@
                         mHeadsetService.getHfpA2DPSyncInterface().releaseA2DP(mDevice);
                 }
             }
-            broadcastStateTransitions();
         }
 
         @Override
@@ -1739,6 +1739,7 @@
                         //any devices before letting Audio knowing about it
                         stateLogI("TWS+ device and other SCO is still Active, no BT_SCO=off");
                     } else {
+                        mSystemInterface.getAudioManager().setBluetoothScoOn(false);
                         if(mSystemInterface.getAudioManager().isSpeakerphoneOn()) {
                             mSystemInterface.getAudioManager().setSpeakerphoneOn(true);
                         }
@@ -1822,6 +1823,7 @@
                          //any devices before letting Audio knowing about it
                          stateLogI("TWS+ device and other SCO is still Active, no BT_SCO=off");
                     } else {
+                        mSystemInterface.getAudioManager().setBluetoothScoOn(false);
                         if(mSystemInterface.getAudioManager().isSpeakerphoneOn()) {
                             mSystemInterface.getAudioManager().setSpeakerphoneOn(true);
                         }