2011-10-13 10:25:51

by Dmitriy Paliy

Subject: [PATCH BlueZ] Fix +CLCC in maemo6 during CSD_CALL_STATUS_COMING

This fixes the same issue as in 8a6119ea1c685fc61419ee444a5967596f524c1c
but for CSD_CALL_STATUS_COMING. Call status change sequence in csd is
IDLE to COMING, COMING to PROCEEDING, and PROCEEDING to WAITING.

Returned 'state of the call' value after CSD_CALL_STATUS_COMING, as well
as after CSD_CALL_STATUS_PROCEEDING, in +CLCC shall be 5 (waiting, MT
call) instead of 4 (incoming, MT call) in maemo6 telephony driver for the
second incoming call.
---
audio/telephony-maemo6.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
index 82cb274..40d1bab 100644
--- a/audio/telephony-maemo6.c
+++ b/audio/telephony-maemo6.c
@@ -943,6 +943,9 @@ static int csd_status_to_hfp(struct csd_call *call)

return CALL_STATUS_INCOMING;
case CSD_CALL_STATUS_COMING:
+ if (g_slist_length(active_calls) > 0)
+ return CALL_STATUS_WAITING;
+
return CALL_STATUS_INCOMING;
case CSD_CALL_STATUS_MO_ALERTING:
return CALL_STATUS_ALERTING;
--
1.7.4.1

2011-10-13 10:46:35

by Johan Hedberg

Subject: Re: [PATCH BlueZ] Fix +CLCC in maemo6 during CSD_CALL_STATUS_COMING

Hi Dmitriy,

On Thu, Oct 13, 2011, Dmitriy Paliy wrote:
> This fixes the same issue as in 8a6119ea1c685fc61419ee444a5967596f524c1c
> but for CSD_CALL_STATUS_COMING. Call status change sequence in csd is
> IDLE to COMING, COMING to PROCEEDING, and PROCEEDING to WAITING.
>
> Returned 'state of the call' value after CSD_CALL_STATUS_COMING, as well
> as after CSD_CALL_STATUS_PROCEEDING, in +CLCC shall be 5 (waiting, MT
> call) instead of 4 (incoming, MT call) in maemo6 telephony driver for the
> second incoming call.
> ---
> audio/telephony-maemo6.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)

Applied. Thanks.

Johan