commit 5ccf5ecbc888dde2f86d240a83f46026d893272d
author Satish Kodishala <skodisha@codeaurora.org> Wed Dec 11 17:37:37 2019 +0530
committer Satish Kumar Kodishala <skodisha@codeaurora.org> Mon Dec 30 06:00:00 2019 +0000
tree bb1021c819ba5f85270a519b7211dd9bbaa4238f
parent f3b630c674b19ff454dbef8ed8fa2ae6ead93252

Resume A2DP only when there are no pending call states

During A2DP streaming and quick call start/end, HFP
waits for A2DP suspend ack to be received. During
this time, HFP caches the call indicators. Resuming
A2DP while sending call indicators may lead to sending
call indicators sending or SCO setup and sending A2DP
start at the same time. Resume A2DP only after
sending pending call states to stack.

CRs-Fixed: 2582198
Change-Id: Ic680d24f2a882f3f10b05f94e785c89607b7520d

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 784dead..491a0bb 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -784,8 +784,16 @@
                     processIntentUpdateCallType((Intent) message.obj);
                     break;
                 case RESUME_A2DP: {
-                     stateLogD("RESUME_A2DP evt, resuming A2DP");
-                     mHeadsetService.getHfpA2DPSyncInterface().releaseA2DP(mDevice);
+                     /* If the call started/ended by the time A2DP suspend ack
+                      * is received, send the call indicators before resuming
+                      * A2DP.
+                      */
+                     if (mPendingCallStates.size() == 0) {
+                         stateLogD("RESUME_A2DP evt, resuming A2DP");
+                         mHeadsetService.getHfpA2DPSyncInterface().releaseA2DP(mDevice);
+                     } else {
+                         stateLogW("RESUME_A2DP evt, pending call states to be sent, not resuming");
+                     }
                      break;
                 }
                 case STACK_EVENT:
@@ -1436,8 +1444,16 @@
                     // ignore
                     break;
                 case RESUME_A2DP: {
-                     stateLogD("RESUME_A2DP evt, resuming A2DP");
-                     mHeadsetService.getHfpA2DPSyncInterface().releaseA2DP(mDevice);
+                     /* If the call started/ended by the time A2DP suspend ack
+                      * is received, send the call indicators before resuming
+                      * A2DP.
+                      */
+                     if (mPendingCallStates.size() == 0) {
+                         stateLogD("RESUME_A2DP evt, resuming A2DP");
+                         mHeadsetService.getHfpA2DPSyncInterface().releaseA2DP(mDevice);
+                     } else {
+                         stateLogW("RESUME_A2DP evt, pending call states to be sent, not resuming");
+                     }
                      break;
                 }
                 default: