diff -Nru bluez-5.71/debian/changelog bluez-5.71/debian/changelog --- bluez-5.71/debian/changelog 2024-10-29 14:52:37.000000000 +0800 +++ bluez-5.71/debian/changelog 2025-01-22 14:12:01.000000000 +0800 @@ -1,3 +1,12 @@ +bluez (5.71-ok1.7) nile; urgency=medium + + * BUG号:无 + * 需求号:无 + * 其他改动说明:同步v11-2503修改 + * 其他改动影响域:无 + + -- caitao <caitao@kylios.cn> Wed, 22 Jan 2025 14:12:01 +0800 + bluez (5.71-ok1.6) nile; urgency=medium * BUG号: diff -Nru bluez-5.71/debian/patches/0026-33-v11-2503.patch bluez-5.71/debian/patches/0026-33-v11-2503.patch --- bluez-5.71/debian/patches/0026-33-v11-2503.patch 1970-01-01 08:00:00.000000000 +0800 +++ bluez-5.71/debian/patches/0026-33-v11-2503.patch 2025-01-22 14:12:01.000000000 +0800 @@ -0,0 +1,116 @@ +From: =?utf-8?b?6YKT5omY?= <dengtuo@kylinos.cn> +Date: Wed, 22 Jan 2025 06:51:00 +0000 +Subject: =?utf-8?b?ITMzIOWQjOatpXYxMS0yNTAz5Luj56CBIE1lcmdlIHB1bGwgcmVxdWVz?= + =?utf-8?b?dCAhMzMgZnJvbSDolKHmtpsvb3Blbmt5bGluL25pbGU=?= + +--- + gobex/gobex-header.c | 1 + + profiles/battery/battery.c | 2 ++ + src/main.conf | 12 ++++++------ + src/shared/att.c | 6 +++--- + 4 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c +index 002ba88..80e8ac4 100644 +--- a/gobex/gobex-header.c ++++ b/gobex/gobex-header.c +@@ -95,6 +95,7 @@ gssize g_obex_header_encode(GObexHeader *header, void *buf, gsize buf_len) + utf16_len = utf8_to_utf16(&utf16, header->v.string); + if (utf16_len < 0 || (guint16) utf16_len > buf_len) + return -1; ++ header->hlen = utf16_len + 3; + g_assert_cmpuint(utf16_len + 3, ==, header->hlen); + u16 = g_htons(utf16_len + 3); + ptr = put_bytes(ptr, &u16, sizeof(u16)); +diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c +index d236cdc..555bdf9 100644 +--- a/profiles/battery/battery.c ++++ b/profiles/battery/battery.c +@@ -139,6 +139,8 @@ static void batt_io_ccc_written_cb(uint16_t att_ecode, void *user_data) + g_free (batt->initial_value); + batt->initial_value = NULL; + ++ btd_battery_update(batt->battery, batt->percentage); ++ + DBG("Battery Level: notification enabled"); + } + +diff --git a/src/main.conf b/src/main.conf +index 35dccce..b90e61d 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 +@@ -61,14 +61,14 @@ + # or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple + # Devices (MPMD) configurations. + # Possible values: "off", "single", "multiple" +-#MultiProfile = off ++MultiProfile = multiple + + # Permanently enables the Fast Connectable setting for adapters that + # support it. When enabled other devices can connect faster to us, + # 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. +@@ -106,7 +106,7 @@ + # How long to keep temporary devices around + # The value is in seconds. Default is 30. + # 0 = disable timer, i.e. never keep temporary devices +-#TemporaryTimeout = 30 ++TemporaryTimeout = 300 + + # Enables the device to issue an SDP request to update known services when + # profile is connected. Defaults to true. +@@ -289,13 +289,13 @@ + # Possible values: + # basic: Use L2CAP Basic Mode + # ertm: Use L2CAP Enhanced Retransmission Mode +-#SessionMode = basic ++SessionMode = ertm + + # AVDTP L2CAP Transport Channel Mode. + # Possible values: + # basic: Use L2CAP Basic Mode + # streaming: Use L2CAP Streaming Mode +-#StreamMode = basic ++StreamMode = streaming + + [Policy] + # +diff --git a/src/shared/att.c b/src/shared/att.c +index 62c884b..4620dc4 100644 +--- a/src/shared/att.c ++++ b/src/shared/att.c +@@ -1040,7 +1040,7 @@ static bool can_read_data(struct io *io, void *user_data) + if (bytes_read < 0) + return false; + +- VERBOSE(att, "(chan %p) ATT received: %zd", chan, bytes_read); ++ //VERBOSE(att, "(chan %p) ATT received: %zd", chan, bytes_read); + + att_hexdump(att, '>', chan->buf, bytes_read); + +@@ -1091,8 +1091,8 @@ static bool can_read_data(struct io *io, void *user_data) + /* For all other opcodes notify the upper layer of the PDU and + * let them act on it. + */ +- DBG(att, "(chan %p) ATT PDU received: 0x%02x", chan, +- opcode); ++ //DBG(att, "(chan %p) ATT PDU received: 0x%02x", chan, ++ // opcode); + handle_notify(chan, pdu, bytes_read); + break; + } diff -Nru bluez-5.71/debian/patches/series bluez-5.71/debian/patches/series --- bluez-5.71/debian/patches/series 2024-10-29 14:52:37.000000000 +0800 +++ bluez-5.71/debian/patches/series 2025-01-22 14:12:01.000000000 +0800 @@ -23,3 +23,4 @@ 0023-29.patch 0024-31-240088-2.patch 0025-32-IAF4FD.patch +0026-33-v11-2503.patch