summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2023-04-25 23:40:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2023-04-25 23:40:36 -0700
commita8902f0470a194ced01fad8e09ac3123072ead8f (patch)
tree3e85617cff075ce8a0e4f2ad42cc0c0a90af3519
parentd1d3a9af7e5ad30f2a10621d6d3e785443333849 (diff)
parent17d4ccf2e9f74cb67803998c5d578f004c00845e (diff)
Merge "Return FAILURE if A2DP active device change is failed" into bt-sys.lnx.13.0
-rw-r--r--btif/src/btif_av.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/btif/src/btif_av.cc b/btif/src/btif_av.cc
index ad549a5a8..c10290cfa 100644
--- a/btif/src/btif_av.cc
+++ b/btif/src/btif_av.cc
@@ -4876,7 +4876,12 @@ static bt_status_t set_active_device(const RawAddress& bd_addr) {
if (!bd_addr.IsEmpty())
btif_transfer_context(btif_av_handle_event, BTIF_AV_CHECK_PENDING_PLAY_EVT,
(char *)&bd_addr, sizeof(RawAddress), NULL);
- return BT_STATUS_SUCCESS;
+ BTIF_TRACE_EVENT("%s: session_wait: %d",__func__, session_wait);
+ if (session_wait) {
+ return BT_STATUS_SUCCESS;
+ } else {
+ return BT_STATUS_FAIL;
+ }
} else {
/* Initiate handoff for the device with address in the argument*/
return btif_transfer_context(btif_av_handle_event,