Diff between e73a294291d9ccfe5ef86c248ccca425a2d05c15 and 212d3b0fd262d3c1b40b6c532bba0d96cf5ded5c

Changed Files

File Additions Deletions Status
android/bluetooth.c +10 -3 modified

Full Patch

diff --git a/android/bluetooth.c b/android/bluetooth.c
index a00edec..984ecba 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -4213,14 +4213,21 @@ static void pair_device_complete(uint8_t status, uint16_t length,
 
 static uint8_t select_device_bearer(struct device *dev)
 {
+	uint8_t res;
+
 	if (dev->bredr && dev->le) {
 		if (dev->le_seen > dev->bredr_seen)
-			return dev->bdaddr_type;
+			res = dev->bdaddr_type;
+		else
+			res = BDADDR_BREDR;
 
-		return BDADDR_BREDR;
+	} else {
+		res = dev->bredr ? BDADDR_BREDR : dev->bdaddr_type;
 	}
 
-	return dev->bredr ? BDADDR_BREDR : dev->bdaddr_type;
+	DBG("Selected bearer %d", res);
+
+	return res;
 }
 
 uint8_t bt_device_last_seen_bearer(const bdaddr_t *bdaddr)