From d3f8eae1ff08dda9a506d40ac6d92a84f098382c Mon Sep 17 00:00:00 2001 From: Frédéric Danis Date: Tue, 19 Jul 2011 18:10:47 +0200 Subject: voicecall: fix callheld indicator for PTS Fix PTS test TP/TWC/BV-03-I [Call Waiting- Hold Active/Retrieve Waiting Call or Held]. PTS test fails after receiving intermediate update of callheld indicator with value 0 (no held call) before it receives update to value 1 (active and held calls). This is due to the non-atomic update of calls status after call swap (moving first call to active state before moving second one to hold state). HFP 1.5 spec specifies that an update of callheld indicator to 1 should be sent after AT+CHLD=2 command. As oFono emulator sends +CIEV only if the indicator value changes, we need to use an intermediate state for callheld indicator (2, all calls on hold). So, in case of multiple active calls, or an active call with an active mutiparty call, force update of callheld indicator to 2. --- src/voicecall.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src') diff --git a/src/voicecall.c b/src/voicecall.c index 36469519..ce975d35 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -734,6 +734,8 @@ static void notify_emulator_call_status(struct ofono_voicecall *vc) { struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom); gboolean call = FALSE; + unsigned int non_mpty = 0; + gboolean multiparty = FALSE; gboolean held = FALSE; gboolean incoming = FALSE; gboolean dialing = FALSE; @@ -751,6 +753,12 @@ static void notify_emulator_call_status(struct ofono_voicecall *vc) switch (v->call->status) { case CALL_STATUS_ACTIVE: call = TRUE; + if (g_slist_find_custom(vc->multiparty_list, + GINT_TO_POINTER(v->call->id), + call_compare_by_id)) + multiparty = TRUE; + else + non_mpty++; break; case CALL_STATUS_HELD: @@ -801,6 +809,18 @@ static void notify_emulator_call_status(struct ofono_voicecall *vc) if (held) data.status = call ? OFONO_EMULATOR_CALLHELD_MULTIPLE : OFONO_EMULATOR_CALLHELD_ON_HOLD; + else if (non_mpty > 1 || (non_mpty && multiparty)) + /* + * After call swap, it is possible that all calls move + * temporarily to active state (depending on call state update + * order), generating an update of callheld indicator to 0. + * This will fail PTS test TP/TWC/BV-03-I. + * + * So, in case of multiple active calls, or an active call with + * an active mutiparty call, force update of callheld indicator + * to 2 (intermediate state allowed). + */ + data.status = OFONO_EMULATOR_CALLHELD_ON_HOLD; else data.status = OFONO_EMULATOR_CALLHELD_NONE; -- cgit v1.2.3