2010-10-19 12:32:04

by Lukasz Pawlik

Subject: [PATCH] Fix problem with handling CHLD=0 command

This patch change handling of CHLD=0 command. Previously both calls
(held and waiting) were terminated when HS sent CHLD=0. Now all held
calls will be released or only incoming call will be rejected without
affecting any held calls.
---
audio/telephony-maemo6.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
index f4dfbde..33fd13f 100644
--- a/audio/telephony-maemo6.c
+++ b/audio/telephony-maemo6.c
@@ -784,8 +784,11 @@ void telephony_call_hold_req(void *telephony_device, const char *cmd)

switch (cmd[0]) {
case '0':
- foreach_call_with_status(CSD_CALL_STATUS_HOLD, release_call);
- foreach_call_with_status(CSD_CALL_STATUS_WAITING,
+ if (find_call_with_status(CSD_CALL_STATUS_WAITING))
+ foreach_call_with_status(CSD_CALL_STATUS_WAITING,
+ release_call);
+ else
+ foreach_call_with_status(CSD_CALL_STATUS_HOLD,
release_call);
break;
case '1':
--
1.7.0.4

2010-10-19 13:44:09

by Johan Hedberg

Subject: Re: [PATCH] Fix problem with handling CHLD=0 command

Hi Lukasz,

On Tue, Oct 19, 2010, Lukasz Pawlik wrote:
> This patch change handling of CHLD=0 command. Previously both calls
> (held and waiting) were terminated when HS sent CHLD=0. Now all held
> calls will be released or only incoming call will be rejected without
> affecting any held calls.
> ---
> audio/telephony-maemo6.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)

Thanks. Pushed upstream.

Johan