From f264a651709752c1b19ca6380a2151451af9615b Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@gmail.com>
Date: Thu, 13 Mar 2014 23:24:13 +0100
Subject: [PATCH] android/handsfree: Simplify condition in connect_audio

---
 android/handsfree.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/android/handsfree.c b/android/handsfree.c
index c41dc7418..a3a8d7df8 100644
--- a/android/handsfree.c
+++ b/android/handsfree.c
@@ -1647,11 +1647,8 @@ static bool disconnect_sco(void)
 
 static bool connect_audio(void)
 {
-	if ((device.features & HFP_HF_FEAT_CODEC) && !device.negotiated_codec) {
-		/* It's probably first connection, select best codec
-		 * and try connect
-		 */
-		select_codec(0);
+	if (device.features & HFP_HF_FEAT_CODEC) {
+		select_codec(device.negotiated_codec);
 		return true;
 	}
 
-- 
2.47.3