diff options
| -rw-r--r-- | bta/av/bta_av_aact.cc | 20 | ||||
| -rw-r--r-- | bta/av/bta_av_main.cc | 12 |
2 files changed, 10 insertions, 22 deletions
diff --git a/bta/av/bta_av_aact.cc b/bta/av/bta_av_aact.cc index 453554241..48bf959db 100644 --- a/bta/av/bta_av_aact.cc +++ b/bta/av/bta_av_aact.cc @@ -1936,7 +1936,6 @@ void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint8_t start = p_scb->started; bool sus_evt = true; BT_HDR* p_buf; - uint8_t set_policy = HCI_ENABLE_SNIFF_MODE; APPL_TRACE_ERROR( "%s: peer %s bta_handle:0x%x audio_open_cnt:%d, p_data %p start:%d", @@ -1946,9 +1945,9 @@ void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress()); if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 || bta_av_cb.audio_open_cnt == 1) { - set_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH; + bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, + p_scb->PeerAddress()); } - bta_sys_set_policy(BTA_ID_AV, set_policy, p_scb->PeerAddress()); if (p_scb->co_started) { if (p_scb->offload_started) { @@ -2436,8 +2435,6 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { * ******************************************************************************/ void bta_av_start_failed(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { - uint8_t set_policy = (HCI_ENABLE_SNIFF_MODE | HCI_ENABLE_MASTER_SLAVE_SWITCH); - APPL_TRACE_ERROR( "%s: peer %s bta_handle:0x%x audio_open_cnt:%d started:%s co_started:%d", __func__, p_scb->PeerAddress().ToString().c_str(), p_scb->hndl, @@ -2449,7 +2446,8 @@ void bta_av_start_failed(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { notify_start_failed(p_scb); } - bta_sys_set_policy(BTA_ID_AV, set_policy, p_scb->PeerAddress()); + bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, + p_scb->PeerAddress()); p_scb->sco_suspend = false; } @@ -2465,7 +2463,6 @@ void bta_av_start_failed(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { tBTA_AV data; tBTA_AV_EVT event; - uint8_t set_policy = HCI_ENABLE_SNIFF_MODE; APPL_TRACE_WARNING( "%s: peer %s bta_handle:0x%x open_status:%d chnl:%d co_started:%d", @@ -2474,9 +2471,9 @@ void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 || bta_av_cb.audio_open_cnt == 1) { - set_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH; + bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, + p_scb->PeerAddress()); } - bta_sys_set_policy(BTA_ID_AV, set_policy, p_scb->PeerAddress()); if (bta_av_cb.audio_open_cnt <= 1) { /* last connection - restore the allow switch flag */ L2CA_SetDesireRole(L2CAP_ROLE_ALLOW_SWITCH); @@ -2547,7 +2544,6 @@ void bta_av_clr_cong(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { tBTA_AV_SUSPEND suspend_rsp; uint8_t err_code = p_data->str_msg.msg.hdr.err_code; - uint8_t set_policy = HCI_ENABLE_SNIFF_MODE; APPL_TRACE_DEBUG("%s: peer %s bta_handle:0x%x audio_open_cnt:%d err_code:%d", __func__, p_scb->PeerAddress().ToString().c_str(), @@ -2588,9 +2584,9 @@ void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress()); if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 || bta_av_cb.audio_open_cnt == 1) { - set_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH; + bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, + p_scb->PeerAddress()); } - bta_sys_set_policy(BTA_ID_AV, set_policy, p_scb->PeerAddress()); /* in case that we received suspend_ind, we may need to call co_stop here */ if (p_scb->co_started) { diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc index 0c604affa..cd4f05ffe 100644 --- a/bta/av/bta_av_main.cc +++ b/bta/av/bta_av_main.cc @@ -915,14 +915,13 @@ void bta_av_restore_switch(void) { tBTA_AV_CB* p_cb = &bta_av_cb; int i; uint8_t mask; - uint8_t set_policy = (HCI_ENABLE_SNIFF_MODE | HCI_ENABLE_MASTER_SLAVE_SWITCH); APPL_TRACE_DEBUG("%s: reg_audio: 0x%x", __func__, bta_av_cb.reg_audio); for (i = 0; i < BTA_AV_NUM_STRS; i++) { mask = BTA_AV_HNDL_TO_MSK(i); if (p_cb->conn_audio == mask) { if (p_cb->p_scb[i]) { - bta_sys_set_policy(BTA_ID_AV, set_policy, + bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, p_cb->p_scb[i]->PeerAddress()); } break; @@ -946,7 +945,6 @@ static void bta_av_sys_rs_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, tBTA_AV_SCB* p_scb = NULL; uint8_t cur_role; uint8_t peer_idx = 0; - uint8_t set_policy = (HCI_ENABLE_SNIFF_MODE | HCI_ENABLE_MASTER_SLAVE_SWITCH); APPL_TRACE_DEBUG( "%s: peer %s new_role:%d hci_status:0x%x bta_av_cb.rs_idx:%d", __func__, @@ -963,12 +961,6 @@ static void bta_av_sys_rs_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, APPL_TRACE_DEBUG( "%s: peer %s found: new_role:%d, hci_status:0x%x bta_handle:0x%x", __func__, peer_addr.ToString().c_str(), id, app_id, p_scb->hndl); - /* - if ((id != HCI_ROLE_MASTER) && (app_id != HCI_SUCCESS)) - { - bta_sys_set_policy(BTA_ID_AV, set_policy, p_scb->PeerAddress()); - } - */ p_buf->hdr.event = BTA_AV_ROLE_CHANGE_EVT; p_buf->hdr.layer_specific = p_scb->hndl; p_buf->new_role = id; @@ -983,7 +975,7 @@ static void bta_av_sys_rs_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, if ((HCI_SUCCESS != app_id) && (BTM_GetRole(peer_addr, &cur_role) == BTM_SUCCESS) && (cur_role == HCI_ROLE_SLAVE)) { - bta_sys_set_policy(BTA_ID_AV, set_policy, peer_addr); + bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, peer_addr); } /* if BTA_AvOpen() was called for other device, which caused the role switch |