Merge ~dirksu/bluez:plucky into ~bluetooth/bluez:plucky

[Dirk Su]

Add upstream patches to improve audio profiles compatibility

https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/2122382

[Daniel van Vugt (vanvugt)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 62a4537..22ddb20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bluez (5.79-2ubuntu1.2) plucky; urgency=medium
+
+  * Improve audio profiles compatibility (LP: #2122382)
+    d/patches: audio-upgrade-versions-to-latest-possible-to-qualify.patch
+    d/patches: a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
+    d/patches: profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch
+
+ -- Dirk Su <[e-mail]>  Wed, 10 Sep 2025 11:08:45 +0800
+
 bluez (5.79-2ubuntu1.1) plucky; urgency=medium
 
   * d/patches/reconnect-hsp-on-a2dp-reconnect.patch: Correct the patch to fix
diff --git a/debian/patches/a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch b/debian/patches/a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
new file mode 100644
index 0000000..ca376c1
--- /dev/null
+++ b/debian/patches/a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
@@ -0,0 +1,91 @@
+From ea3f4047e452b081e34d017cce316aba9d623301 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <[e-mail]>
+Date: Mon, 17 Feb 2025 12:48:02 +0100
+Subject: [PATCH] a2dp: Remove Endpoints cache entries on device removal
+
+When a device is removed, currently the endpoints and last used info
+are kept in cache:
+  [General]
+  Name=Frederic's Phone
+
+  [Endpoints]
+  01=00:00:01:29f50235
+  02=00:02:01:80010484e200
+  LastUsed=01:02
+
+This may prevent future connection, after a new pairing, to use the
+best codec available.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2122382
+---
+ profiles/audio/a2dp.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
+index 0eac151db..81dbbfae3 100644
+--- a/profiles/audio/a2dp.c
++++ b/profiles/audio/a2dp.c
+@@ -880,6 +880,44 @@ static void store_remote_seps(struct a2dp_channel *chan)
+ 	g_key_file_free(key_file);
+ }
+ 
++static void remove_endpoints_cache(struct btd_service *service)
++{
++	struct btd_device *device = btd_service_get_device(service);
++	char filename[PATH_MAX];
++	char dst_addr[18];
++	GKeyFile *key_file;
++	GError *gerr = NULL;
++	char *data;
++	gsize length = 0;
++
++	ba2str(device_get_address(device), dst_addr);
++
++	create_filename(filename, PATH_MAX, "/%s/cache/%s",
++		btd_adapter_get_storage_dir(device_get_adapter(device)),
++		dst_addr);
++
++	key_file = g_key_file_new();
++	if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
++		g_error_free(gerr);
++		g_key_file_free(key_file);
++		return;
++	}
++	g_key_file_remove_group(key_file, "Endpoints", NULL);
++
++	data = g_key_file_to_data(key_file, &length, NULL);
++	if (length > 0) {
++		create_file(filename, 0600);
++		if (!g_file_set_contents(filename, data, length, &gerr)) {
++			error("Unable set contents for %s: (%s)", filename,
++								gerr->message);
++			g_error_free(gerr);
++		}
++	}
++
++	g_free(data);
++	g_key_file_free(key_file);
++}
++
+ static void invalidate_remote_cache(struct a2dp_setup *setup,
+ 						struct avdtp_error *err)
+ {
+@@ -3352,6 +3390,7 @@ static int a2dp_source_probe(struct btd_service *service)
+ static void a2dp_source_remove(struct btd_service *service)
+ {
+ 	source_unregister(service);
++	remove_endpoints_cache(service);
+ }
+ 
+ static int a2dp_sink_probe(struct btd_service *service)
+@@ -3366,6 +3405,7 @@ static int a2dp_sink_probe(struct btd_service *service)
+ static void a2dp_sink_remove(struct btd_service *service)
+ {
+ 	sink_unregister(service);
++	remove_endpoints_cache(service);
+ }
+ 
+ static int a2dp_source_connect(struct btd_service *service)
+-- 
+2.43.0
+
diff --git a/debian/patches/audio-upgrade-versions-to-latest-possible-to-qualify.patch b/debian/patches/audio-upgrade-versions-to-latest-possible-to-qualify.patch
new file mode 100644
index 0000000..853f265
--- /dev/null
+++ b/debian/patches/audio-upgrade-versions-to-latest-possible-to-qualify.patch
@@ -0,0 +1,92 @@
+From f0e9ecb9f4fe3a7bdb011dc155cf6ad657a289ee Mon Sep 17 00:00:00 2001
+From: Raghavender Reddy Bujala <[e-mail]>
+Date: Wed, 12 Feb 2025 14:35:53 +0530
+Subject: [PATCH] audio: upgrade versions to latest possible to qualify
+
+Most of the existing profile versions are withdrawn
+to make PTS successfull, need to upgrade the version
+for audio profiles and there are no mandatory feature
+changes between these versions are seen.
+
+Version changes
+A2DP from 1.3 to 1.4
+HFP from 1.7 to 1.8
+AVRCP TG from 1.5 to 1.6
+AVCTP from 1.3 to 1.4
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2122382
+---
+ profiles/audio/a2dp.c  | 2 +-
+ profiles/audio/avrcp.c | 6 +++---
+ src/profile.c          | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
+index 438ef29a8..0eac151db 100644
+--- a/profiles/audio/a2dp.c
++++ b/profiles/audio/a2dp.c
+@@ -1595,7 +1595,7 @@ static sdp_record_t *a2dp_record(uint8_t type)
+ 	sdp_record_t *record;
+ 	sdp_data_t *psm, *version, *features;
+ 	uint16_t lp = AVDTP_UUID;
+-	uint16_t a2dp_ver = 0x0103, avdtp_ver = 0x0103, feat = 0x000f;
++	uint16_t a2dp_ver = 0x0104, avdtp_ver = 0x0103, feat = 0x000f;
+ 
+ 	record = sdp_record_alloc();
+ 	if (!record)
+diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
+index 6378b7a6e..7e9a383b0 100644
+--- a/profiles/audio/avrcp.c
++++ b/profiles/audio/avrcp.c
+@@ -138,7 +138,7 @@
+ 
+ #define AVRCP_BROWSING_TIMEOUT		1
+ #define AVRCP_CT_VERSION		0x0106
+-#define AVRCP_TG_VERSION		0x0105
++#define AVRCP_TG_VERSION		0x0106
+ 
+ #define AVRCP_SCOPE_MEDIA_PLAYER_LIST			0x00
+ #define AVRCP_SCOPE_MEDIA_PLAYER_VFS			0x01
+@@ -414,7 +414,7 @@ static sdp_record_t *avrcp_ct_record(bool browsing)
+ 	sdp_record_t *record;
+ 	sdp_data_t *psm[2], *version, *features;
+ 	uint16_t lp = AVCTP_CONTROL_PSM;
+-	uint16_t avctp_ver = 0x0103;
++	uint16_t avctp_ver = 0x0104;
+ 	uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
+ 					AVRCP_FEATURE_CATEGORY_2 |
+ 					AVRCP_FEATURE_CATEGORY_3 |
+@@ -493,7 +493,7 @@ static sdp_record_t *avrcp_tg_record(bool browsing)
+ 	sdp_record_t *record;
+ 	sdp_data_t *psm_control, *version, *features;
+ 	uint16_t lp = AVCTP_CONTROL_PSM;
+-	uint16_t avctp_ver = 0x0103;
++	uint16_t avctp_ver = 0x0104;
+ 	uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
+ 					AVRCP_FEATURE_CATEGORY_2 |
+ 					AVRCP_FEATURE_CATEGORY_3 |
+diff --git a/src/profile.c b/src/profile.c
+index af32dbd9f..9fdfb7dff 100644
+--- a/src/profile.c
++++ b/src/profile.c
+@@ -2075,7 +2075,7 @@ static struct default_settings {
+ 		.authorize	= true,
+ 		.auto_connect	= true,
+ 		.get_record	= get_hfp_hf_record,
+-		.version	= 0x0107,
++		.version	= 0x0108,
+ 	}, {
+ 		.uuid		= HSP_HS_UUID,
+ 		.name		= "Headset unit",
+@@ -2095,7 +2095,7 @@ static struct default_settings {
+ 		.authorize	= true,
+ 		.auto_connect	= true,
+ 		.get_record	= get_hfp_ag_record,
+-		.version	= 0x0107,
++		.version	= 0x0108,
+ 		/* HFP 1.7.2: By default features bitfield is 0b001001 */
+ 		.features	= 0x09,
+ 	}, {
+-- 
+2.43.0
+
diff --git a/debian/patches/profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch b/debian/patches/profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch
new file mode 100644
index 0000000..6a5f48f
--- /dev/null
+++ b/debian/patches/profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch
@@ -0,0 +1,110 @@
+From f2120e3ded0656c8eda3d8058ee35654aba3fd09 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <[e-mail]>
+Date: Wed, 26 Mar 2025 10:07:11 +0100
+Subject: [PATCH] profiles/avdtp: Fix reply for bad media transport format
+
+Currently the avdtp_setconf_cmd() fails to check the capability length
+of the Media Transport Service Category, which should be 0, because
+caps_to_list() doesn't add it to the list of services as it should
+be bigger than packet boundary.
+
+This commit adds an &err parameter to caps_to_list() and set the error
+to AVDTP_BAD_MEDIA_TRANSPORT_FORMAT if Media Transport capability as
+invalid length.
+
+This is required for passing AVDTP/SNK/ACP/TRA/BTR/BI-01-C PTS test
+case:
+To verify that the IUT (ACP) is able to issue a set configuration
+reject response to the INT if the format of the media transport is
+incorrect.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2122382
+---
+ profiles/audio/avdtp.c | 35 ++++++++++++++++++++---------------
+ 1 file changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
+index 80fbe847e..dd8458f20 100644
+--- a/profiles/audio/avdtp.c
++++ b/profiles/audio/avdtp.c
+@@ -1312,7 +1312,8 @@ struct avdtp_remote_sep *avdtp_find_remote_sep(struct avdtp *session,
+ 
+ static GSList *caps_to_list(uint8_t *data, size_t size,
+ 				struct avdtp_service_capability **codec,
+-				gboolean *delay_reporting)
++				gboolean *delay_reporting,
++				uint8_t *err)
+ {
+ 	struct avdtp_service_capability *cap;
+ 	GSList *caps;
+@@ -1328,6 +1329,17 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
+ 
+ 		cap = (struct avdtp_service_capability *)data;
+ 
++		/* Verify that the Media Transport capability's length = 0.
++		 * Reject otherwise
++		 */
++		if (cap->category == AVDTP_MEDIA_TRANSPORT &&
++					cap->length != 0) {
++			error("Invalid media transport in getcap resp");
++			if (err)
++				*err = AVDTP_BAD_MEDIA_TRANSPORT_FORMAT;
++			break;
++		}
++
+ 		if (sizeof(*cap) + cap->length > size) {
+ 			error("Invalid capability data in getcap resp");
+ 			break;
+@@ -1494,9 +1506,8 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
+ 	struct conf_rej rej;
+ 	struct avdtp_local_sep *sep;
+ 	struct avdtp_stream *stream;
+-	uint8_t err, category = 0x00;
++	uint8_t err = 0, category = 0x00;
+ 	struct btd_service *service;
+-	GSList *l;
+ 
+ 	if (size < sizeof(struct setconf_req)) {
+ 		error("Too short getcap request");
+@@ -1552,7 +1563,10 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
+ 	stream->caps = caps_to_list(req->caps,
+ 					size - sizeof(struct setconf_req),
+ 					&stream->codec,
+-					&stream->delay_reporting);
++					&stream->delay_reporting,
++					&err);
++	if (err)
++		goto failed_stream;
+ 
+ 	if (!stream->caps || !stream->codec) {
+ 		err = AVDTP_UNSUPPORTED_CONFIGURATION;
+@@ -1560,16 +1574,6 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
+ 		goto failed_stream;
+ 	}
+ 
+-	/* Verify that the Media Transport capability's length = 0. Reject otherwise */
+-	for (l = stream->caps; l != NULL; l = g_slist_next(l)) {
+-		struct avdtp_service_capability *cap = l->data;
+-
+-		if (cap->category == AVDTP_MEDIA_TRANSPORT && cap->length != 0) {
+-			err = AVDTP_BAD_MEDIA_TRANSPORT_FORMAT;
+-			goto failed_stream;
+-		}
+-	}
+-
+ 	if (stream->delay_reporting && session->version < 0x0103)
+ 		session->version = 0x0103;
+ 
+@@ -2827,7 +2831,8 @@ static gboolean avdtp_get_capabilities_resp(struct avdtp *session,
+ 	}
+ 
+ 	sep->caps = caps_to_list(resp->caps, size - sizeof(struct getcap_resp),
+-					&sep->codec, &sep->delay_reporting);
++					&sep->codec, &sep->delay_reporting,
++					NULL);
+ 
+ 	return TRUE;
+ }
+-- 
+2.43.0
+
diff --git a/debian/patches/series b/debian/patches/series
index b1a72e2..484b084 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,6 @@ raspi-bcm43xx-load-firmware.patch
 raspi-bcm43xx-3wire.patch
 ubuntu_error_restart.patch
 reconnect-hsp-on-a2dp-reconnect.patch
+profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch
+a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
+audio-upgrade-versions-to-latest-possible-to-qualify.patch