korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-16 00:13:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/handsfree: Track if incoming call is being rejected

Browse Source 
If incoming call is being rejected following phone_state_change are
being send to handsfree HAL (probably due to some intermediate state
when incoming call is being rejected):
active=0 hold=0 state=idle
active=0 hold=0 state=incoming
active=0 hold=0 state=idle
active=0 hold=0 state=idle

To avoid sending bogus RING and callsetup=1 indicators this needs to be
tracked. This was afecting TC_AG_ICR_BV_01_I,TC_AG_ICR_BV_02_I and
TC_AG_TWC_BV_02_I qualification test cases.
This commit is contained in:
Szymon Janc 2014-03-25 18:38:10 +01:00
parent a4fe38cd6a
commit bbc32b300a
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android/handsfree.c
View File

@ -138,6 +138,7 @@ static struct {
int num_active;
int num_held;
int setup_state;
bool call_hanging_up;
uint8_t negotiated_codec;
uint8_t proposed_codec;
@ -2016,6 +2017,9 @@ static void phone_state_incoming(int num_active, int num_held, uint8_t type,
if (device.setup_state == HAL_HANDSFREE_CALL_STATE_INCOMING)
return;
if (device.call_hanging_up)
return;
if (num_active > 0 || num_held > 0) {
phone_state_waiting(num_active, num_held, type, number,
number_len);
@ -2062,6 +2066,11 @@ static void phone_state_idle(int num_active, int num_held)
update_indicator(IND_CALLHELD, 1);
update_indicator(IND_CALLSETUP, 0);
if (num_active == device.num_active &&
num_held == device.num_held)
device.call_hanging_up = true;
break;
case HAL_HANDSFREE_CALL_STATE_DIALING:
case HAL_HANDSFREE_CALL_STATE_ALERTING:
@ -2071,6 +2080,12 @@ static void phone_state_idle(int num_active, int num_held)
update_indicator(IND_CALLSETUP, 0);
break;
case HAL_HANDSFREE_CALL_STATE_IDLE:
if (device.call_hanging_up) {
device.call_hanging_up = false;
return;
}
/* check if calls swapped */
if (num_held != 0 && num_active != 0 &&
device.num_active == num_held &&