fix: Fix airpods pairing and main conf for connection.

Author: uos-eng

debian/changelog

@@ -1,3 +1,10 @@
+bluez (5.71-1deepin3) unstable; urgency=medium
+
+  * fix: Fix main conf for connection.
+  *      Fix airpods pairing.
+
+ -- zhaochengyi <zhaochengyi@uniontech.com>  Sat, 14 Dec 2024 16:35:09 +0800
+
 bluez (5.71-1deepin2) unstable; urgency=medium
 
   * Change the service startup program to use a shell script.

debian/patches/deepin-bug282163-Fix-airpods-pairing.patch

@@ -0,0 +1,40 @@
+From 98bed16d254c3f1b2075290c69e74749d08c39b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
+Date: Fri, 5 Apr 2024 11:00:50 +0200
+Subject: [PATCH] device: Fix airpods pairing
+
+Apple Airpods are discoverable and pairable in BREDR mode, but also
+advertise in unconnectable mode in LE with the same Public address, at the
+same time. As the pairing process uses the latest seen address, sometimes
+it uses the LE Public address to pair, which fails.
+
+This commit introduces the connectable state when selecting the bearer to
+use for a connection. The last_seen value is used only for connectable
+devices.
+---
+ src/device.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/device.c b/src/device.c
+index ac0b0e003..1d4b8ab36 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -2537,13 +2537,13 @@ static uint8_t select_conn_bearer(struct btd_device *dev)
+ 	if (dev->bdaddr_type == BDADDR_LE_RANDOM)
+ 		return dev->bdaddr_type;
+ 
+-	if (dev->bredr_state.last_seen) {
++	if (dev->bredr_state.connectable && dev->bredr_state.last_seen) {
+ 		bredr_last = current - dev->bredr_state.last_seen;
+ 		if (bredr_last > SEEN_TRESHHOLD)
+ 			bredr_last = NVAL_TIME;
+ 	}
+ 
+-	if (dev->le_state.last_seen) {
++	if (dev->le_state.connectable && dev->le_state.last_seen) {
+ 		le_last = current - dev->le_state.last_seen;
+ 		if (le_last > SEEN_TRESHHOLD)
+ 			le_last = NVAL_TIME;
+-- 
+2.20.1
+

debian/patches/deepin-bug282163-Fix-main-conf-for-connection.patch

@@ -0,0 +1,34 @@
+From e4b8fb410768d505ebb79e7f26bfc037337ea2f6 Mon Sep 17 00:00:00 2001
+From: Chengyi Zhao <zhaochengyi@uniontech.com>
+Date: Sat, 14 Dec 2024 15:57:06 +0800
+Subject: [PATCH] fix: Fix main conf for connection
+
+---
+ src/main.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.conf b/src/main.conf
+index 35dccce..d0d54cb 100644
+--- a/src/main.conf
++++ b/src/main.conf
+@@ -12,7 +12,7 @@
+ # How long to stay in discoverable mode before going back to non-discoverable
+ # The value is in seconds. Default is 180, i.e. 3 minutes.
+ # 0 = disable timer, i.e. stay discoverable forever
+-#DiscoverableTimeout = 0
++DiscoverableTimeout = 0
+ 
+ # Always allow pairing even if there are no agent registered
+ # Possible values: true, false
+@@ -68,7 +68,7 @@
+ # however the tradeoff is increased power consumptions. This feature
+ # will fully work only on kernel version 4.1 and newer. Defaults to
+ # 'false'.
+-#FastConnectable = false
++FastConnectable = true
+ 
+ # Default privacy setting.
+ # Enables use of private address.
+-- 
+2.20.1
+

debian/patches/series

@@ -14,3 +14,6 @@ Change-shebang-from-usr-bin-python-to-usr-bin-python.patch
 Add-HCI_TO_STR-macro-for-FIRMWARE_DIR.patch
 uniontech-add-custom-config-for-huawei.patch
 uniontech-add-sh-for-debug.patch
+deepin-bug282163-Fix-airpods-pairing.patch
+deepin-bug282163-Fix-main-conf-for-connection.patch
+