mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-28 16:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp_ag: handle call termination in alerting call state

Browse Source
This commit is contained in:
Milanka Ringwald 2022-05-24 14:39:46 +02:00
parent 5eff374c75
commit 07a44c5e7c
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -18,7 +18,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- GAP: fix gap_connect_cancel for gap_connect_with_whitelist
- L2CAP: Fix accept incoming ERTM connection when Information Request already complete
- HFP AG: activate all AG indicators upon service level connection establishment
- HFP_AG: handle call termination in alerting call state
### Changed
- A2DP: new a2dp.c contains shared code of Sink and Source roles
- A2DP Sink: automatically configure stream endpoint for outgoing connections

26
src/classic/hfp_ag.c
View File

@ -1394,8 +1394,17 @@ static void hfp_ag_trigger_reject_call(void){
while (btstack_linked_list_iterator_has_next(&it)){
hfp_connection_t * connection = (hfp_connection_t *)btstack_linked_list_iterator_next(&it);
if (connection->local_role != HFP_ROLE_AG) continue;
if ((connection->call_state != HFP_CALL_INCOMING_RINGING) &&
(connection->call_state != HFP_CALL_W4_AUDIO_CONNECTION_FOR_IN_BAND_RING)) continue;
switch (connection->call_state){
case HFP_CALL_INCOMING_RINGING:
case HFP_CALL_W4_AUDIO_CONNECTION_FOR_IN_BAND_RING:
case HFP_CALL_OUTGOING_RINGING:
case HFP_CALL_OUTGOING_INITIATED:
case HFP_CALL_OUTGOING_DIALING:
break;
default:
continue;
}
connection->call_state = HFP_CALL_IDLE;
connection->ag_indicators_status_update_bitmap = store_bit(connection->ag_indicators_status_update_bitmap, callsetup_indicator_index, 1);
@ -1700,19 +1709,14 @@ static void hfp_ag_call_sm(hfp_ag_call_event_t event, hfp_connection_t * hfp_con
case HFP_CALL_STATUS_NO_HELD_OR_ACTIVE_CALLS:
switch (hfp_gsm_callsetup_status()){
case HFP_CALLSETUP_STATUS_INCOMING_CALL_SETUP_IN_PROGRESS:
case HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_ALERTING_STATE:
case HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_DIALING_STATE:
hfp_gsm_handler(HFP_AG_TERMINATE_CALL_BY_HF, 0, 0, NULL);
hfp_ag_set_callsetup_indicator();
hfp_ag_transfer_callsetup_state();
hfp_ag_trigger_reject_call();
log_info("HF Rejected Incoming call, AG terminate call");
break;
case HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_DIALING_STATE:
case HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_ALERTING_STATE:
hfp_gsm_handler(HFP_AG_TERMINATE_CALL_BY_HF, 0, 0, NULL);
hfp_ag_set_callsetup_indicator();
hfp_ag_transfer_callsetup_state();
log_info("AG terminate outgoing call process");
break;
default:
break;
}
@ -1733,7 +1737,9 @@ static void hfp_ag_call_sm(hfp_ag_call_event_t event, hfp_connection_t * hfp_con
switch (hfp_gsm_call_status()){
case HFP_CALL_STATUS_NO_HELD_OR_ACTIVE_CALLS:
switch (hfp_gsm_callsetup_status()){
case HFP_CALLSETUP_STATUS_INCOMING_CALL_SETUP_IN_PROGRESS:
case HFP_CALLSETUP_STATUS_NO_CALL_SETUP_IN_PROGRESS:
case HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_DIALING_STATE:
case HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_ALERTING_STATE:
hfp_gsm_handler(HFP_AG_TERMINATE_CALL_BY_AG, 0, 0, NULL);
hfp_ag_set_callsetup_indicator();
hfp_ag_trigger_reject_call();