2023-12-26 06:31:00

by clancy_shang

Subject: [PATCH] [BlueZ] adapter: Fix airpod device pair fail

From: Clancy Shang <[email protected]>

Airpod is performing inquiry scans in BR/EDR and advertising in an
unconnectable mode with the same public address at the same time.
with this feature, when found airpod device, set the bredr support,
fix it pairs fail bug.

Signed-off-by: Clancy Shang <[email protected]>
---
src/adapter.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

diff --git a/src/adapter.c b/src/adapter.c
index 022390f0d..71f7ed86d 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7066,6 +7066,24 @@ static void adapter_msd_notify(struct btd_adapter *adapter,
}
}

+#define APPLE_INC_VENDOR_ID 0x004c
+
+static bool eir_msd_is_apple_inc(GSList *msd_list)
+{
+ GSList *msd_l, *msd_next;
+
+ for (msd_l = msd_list; msd_l != NULL; msd_l = msd_next) {
+ const struct eir_msd *msd = msd_l->data;
+
+ msd_next = g_slist_next(msd_l);
+
+ if (msd->company == APPLE_INC_VENDOR_ID)
+ return true;
+ }
+
+ return false;
+}
+
static bool is_filter_match(GSList *discovery_filter, struct eir_data *eir_data,
int8_t rssi)
{
@@ -7281,6 +7299,13 @@ void btd_adapter_device_found(struct btd_adapter *adapter,
device_update_last_seen(dev, BDADDR_BREDR, !not_connectable);
}

+ if (eir_msd_is_apple_inc(eir_data.msd_list) &&
+ (not_connectable == true) &&
+ (bdaddr_type == BDADDR_LE_PUBLIC)) {
+ device_set_bredr_support(dev);
+ device_update_last_seen(dev, BDADDR_BREDR, true);
+ }
+
if (eir_data.name != NULL && eir_data.name_complete)
device_store_cached_name(dev, eir_data.name);

--
2.25.1

2023-12-26 07:32:11

by bluez.test.bot

Subject: RE: [BlueZ] adapter: Fix airpod device pair fail

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=812857

---Test result---

Test Summary:
CheckPatch PASS 0.33 seconds
GitLint PASS 0.21 seconds
BuildEll PASS 25.95 seconds
BluezMake PASS 721.87 seconds
MakeCheck PASS 11.55 seconds
MakeDistcheck PASS 161.60 seconds
CheckValgrind PASS 225.26 seconds
CheckSmatch PASS 330.62 seconds
bluezmakeextell PASS 107.11 seconds
IncrementalBuild PASS 676.37 seconds
ScanBuild PASS 964.20 seconds



---
Regards,
Linux Bluetooth