[PATCH] voicecall: fix release and answer existing call validation

[Mike Brudevold <puffy.taco@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 928 bytes --]

From: Michael Brudevold <michael.brudevold@logicpd.com>

Release and answer should be allowed when there are held calls as well as the
existing check for waiting calls.  Most implementations use AT+CHLD=1 which
will resume the other call, be it waiting or held.  This follows the HFP,
GSM 07.07 and 3GPP 27.007 specs.
---
 src/voicecall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/voicecall.c b/src/voicecall.c
index 263f1ee..2d261bf 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1684,7 +1684,7 @@ static DBusMessage *manager_release_and_answer(DBusConnection *conn,
 	if (vc->pending || vc->dial_req || vc->pending_em)
 		return __ofono_error_busy(msg);
 
-	if (!voicecalls_have_waiting(vc))
+	if (!(voicecalls_have_waiting(vc) || voicecalls_have_held(vc)))
 		return __ofono_error_failed(msg);
 
 	if (vc->driver->release_all_active == NULL)
-- 
1.7.5.4