From: Johan Hedberg <johan.hedberg@intel.com>
Date: Fri, 14 Dec 2012 09:28:13 +0000 (+0200)
Subject: core: Match remote UUID instead of local one with ConnectProfile
X-Git-Tag: android-x86-4.4-r3~10221
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eaff2553e6affa626a7bef36cb74230b6f189e6d;p=android-x86%2Fexternal-bluetooth-bluez.git

core: Match remote UUID instead of local one with ConnectProfile
---

diff --git a/src/device.c b/src/device.c
index 16ab3817c..3883bd63b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1191,12 +1191,15 @@ static struct btd_profile *find_connectable_profile(struct btd_device *dev,
 
 	for (l = dev->profiles; l != NULL; l = g_slist_next(l)) {
 		struct btd_profile *p = l->data;
+		int i;
 
-		if (!p->connect || !p->local_uuid)
+		if (!p->connect || !p->remote_uuids)
 			continue;
 
-		if (strcasecmp(uuid, p->local_uuid) == 0)
-			return p;
+		for (i = 0; p->remote_uuids[i] != NULL; i++) {
+			if (strcasecmp(uuid, p->remote_uuids[i]) == 0)
+				return p;
+		}
 	}
 
 	return NULL;