From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Wed, 13 Nov 2013 13:26:36 +0000 (+0200)
Subject: audio/A2DP: Return -ENOPROTOOPT if record doesn't exist
X-Git-Tag: android-x86-4.4-r3~6867
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5cc87d0ab019473f662a716a81317bf0ce69dc65;p=android-x86%2Fexternal-bluetooth-bluez.git

audio/A2DP: Return -ENOPROTOOPT if record doesn't exist

In case record is not registered it means no endpoint is available so
return -ENOPROTOOPT to indicate that it is currently not available.
---

diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 6b3d6b2f4..864cb188b 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -1861,10 +1861,22 @@ static void a2dp_sink_remove(struct btd_service *service)
 static int a2dp_source_connect(struct btd_service *service)
 {
 	struct btd_device *dev = btd_service_get_device(service);
+	struct btd_adapter *adapter = device_get_adapter(dev);
+	struct a2dp_server *server;
 	const char *path = device_get_path(dev);
 
 	DBG("path %s", path);
 
+	server = find_server(servers, adapter);
+	if (!server || !server->sink_enabled) {
+		DBG("Unexpected error: cannot find server");
+		return -EPROTONOSUPPORT;
+	}
+
+	/* Return protocol not available if no record/endpoint exists */
+	if (server->sink_record_id == 0)
+		return -ENOPROTOOPT;
+
 	return source_connect(service);
 }
 
@@ -1881,10 +1893,22 @@ static int a2dp_source_disconnect(struct btd_service *service)
 static int a2dp_sink_connect(struct btd_service *service)
 {
 	struct btd_device *dev = btd_service_get_device(service);
+	struct btd_adapter *adapter = device_get_adapter(dev);
+	struct a2dp_server *server;
 	const char *path = device_get_path(dev);
 
 	DBG("path %s", path);
 
+	server = find_server(servers, adapter);
+	if (!server || !server->source_enabled) {
+		DBG("Unexpected error: cannot find server");
+		return -EPROTONOSUPPORT;
+	}
+
+	/* Return protocol not available if no record/endpoint exists */
+	if (server->source_record_id == 0)
+		return -ENOPROTOOPT;
+
 	return sink_connect(service);
 }