From 585ab9dbaa20e421f5a2dcefc17b10b304da466e Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin2.jansa@lgepartner.com>
Date: Mon, 4 Sep 2023 01:01:55 +0200
Subject: [PATCH] webos: bluez5 (refresh patches to apply on 5.69 version)

:Release Notes:

:Detailed Notes:
Fixes:
http://gecko.lge.com:8000/Errors/Details/685243

Applying patch 0012-Support-enabling-avdtp-delayReport.patch
patching file profiles/audio/a2dp.c
Hunk #1 succeeded at 2391 (offset 1 line).
patching file profiles/audio/a2dp.h
patching file profiles/audio/avdtp.c
patching file profiles/audio/avdtp.h
patching file profiles/audio/media.c
Hunk #2 succeeded at 1450 (offset 23 lines).
Hunk #3 succeeded at 3243 (offset 23 lines).
patching file profiles/audio/media.h
Hunk #2 succeeded at 26 with fuzz 2 (offset 1 line).
patching file src/adapter.c
Hunk #2 succeeded at 286 (offset 5 lines).
Hunk #3 succeeded at 367 (offset 6 lines).
Hunk #4 succeeded at 574 (offset 6 lines).
Hunk #5 succeeded at 3508 (offset 6 lines).
Hunk #6 succeeded at 3933 (offset 3 lines).
Hunk #7 succeeded at 5312 (offset 4 lines).
Hunk #8 succeeded at 6858 (offset 16 lines).
Hunk #9 succeeded at 6903 (offset 16 lines).
Hunk #10 succeeded at 6914 (offset 16 lines).
patching file src/adapter.h
patching file src/btd.h
patching file src/main.c
Hunk #1 succeeded at 82 (offset -3 lines).
Hunk #2 succeeded at 1033 (offset -3 lines).
patching file src/main.conf

The context lines in the patches can be updated with devtool:

    devtool modify bluez5
    devtool finish --force-patch-refresh bluez5 <layer_path>

Don't forget to review changes done by devtool!

Patch log indicates that patches do not apply cleanly. [patch-fuzz]

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-691] Create GPVB with Yocto 4.3 Nanbield

Change-Id: Ibeacee43896df30dc10a207214a13c57dbaa311b
---
 ...time-out-when-default-is-set-to-zero.patch |  4 +-
 ...t-signal-on-remote-device-disconnect.patch |  3 +-
 ...evice-type-like-BLE-BREDR-from-bluez.patch |  7 ++-
 ...-when-device-address-type-is-BDADDR_.patch |  8 ++--
 ...tem-bus-instead-of-session-for-obexd.patch |  2 +-
 ...tion-to-get-connected-profiles-uuids.patch | 10 ++--
 ...gh-commad-support-required-for-webos.patch | 10 ++--
 ...ded-dbus-signal-for-MediaPlayRequest.patch | 14 +++---
 ...-getting-remote-device-features-list.patch | 10 ++--
 ...-Fix-volume-property-not-able-to-set.patch |  6 +--
 ...-notification-not-appearing-after-12.patch | 13 +++--
 ...2-Support-enabling-avdtp-delayReport.patch | 47 +++++++++----------
 ...o-get-connectedUuid-s-in-case-of-inc.patch |  7 ++-
 ...-connected-uuids-when-profile-is-dis.patch |  7 ++-
 ...-getStatus-not-updated-when-unpaired.patch |  5 +-
 ...airing-capability-as-NoInputNoOutput.patch |  2 +-
 ...etting-supported-notification-events.patch |  9 ++--
 ...anceName-MapInstanceProperties-parsi.patch | 19 ++++----
 ...pport-based-on-MAPInstance-Name-Modi.patch |  3 +-
 .../0020-Disabling-DB-Hash-for-Gatt.patch     | 11 ++---
 ...on-property-in-org.bluez.obex.Messag.patch |  3 +-
 ...dle-property-in-org.bluez.obex.Trans.patch |  3 +-
 ...nterface-for-sent-message-related-no.patch |  3 +-
 ...aying-return-error-when-player-not-s.patch |  3 +-
 ...0025-AVRCP-MediaItem-object-path-fix.patch |  3 +-
 ...26-Revert-a2dp-Add-reverse-discovery.patch |  9 ++--
 ...support-for-meshd-to-use-RAW-channel.patch |  3 +-
 ...esh-fixed-ell-undefined-symbol-error.patch |  5 +-
 28 files changed, 105 insertions(+), 124 deletions(-)

diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch
index dfad95aea..bd207ae5a 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch
@@ -1,4 +1,4 @@
-From a3f6c02d722b9de76bdefb438e06d6e06bd74087 Mon Sep 17 00:00:00 2001
+From a0a2012b203b5c1624266cda476f5c1a85c0c8d6 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Wed, 11 Apr 2018 11:03:20 +0530
 Subject: [PATCH] Fix advertise time out when default is set to zero
@@ -26,7 +26,7 @@ Upstream-Status: Pending
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/src/advertising.c b/src/advertising.c
-index 0dceb14c3..761d4d0bd 100644
+index 2c9a5a443..efd795712 100644
 --- a/src/advertising.c
 +++ b/src/advertising.c
 @@ -569,13 +569,18 @@ static bool parse_local_name(DBusMessageIter *iter,
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch
index 6b8d31a43..9ac9ac7cb 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch
@@ -1,4 +1,4 @@
-From a5cc25ac4190a532a13d888169e019464c93d24f Mon Sep 17 00:00:00 2001
+From 7aa924395da214310bd446f5b7640694b52463d7 Mon Sep 17 00:00:00 2001
 From: Vibhanshu Dhote <vibhanshu.dhote@lge.com>
 Date: Thu, 17 May 2018 18:15:48 +0530
 Subject: [PATCH] Send disconnect signal on remote device disconnect
@@ -19,7 +19,6 @@ Builded and tested
 :Issues Addressed:
 [PLAT-49640] Implementation of SPP profile Connect/Disconnect API in
              Bluez Sil
-
 ---
 Upstream-Status: Pending
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch
index 53fe5ba59..07b501aea 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch
@@ -1,4 +1,4 @@
-From a7acbee5a412370fbf0e26e1895162315e023ec5 Mon Sep 17 00:00:00 2001
+From 2fd1f2817c4815545a6438c49602a480b48c9f21 Mon Sep 17 00:00:00 2001
 From: "vijaya.sundaram" <vijaya.sundaram@lge.com>
 Date: Fri, 1 Jun 2018 11:43:15 +0530
 Subject: [PATCH] Fetching device type like BLE, BREDR from bluez
@@ -17,7 +17,6 @@ device/getStatus luna command for device type property as ble, bredr
 :Issues Addressed:
 [PLAT-58422] GAP functionality type of device like BLE, BREDR
              not working, always Unknown
-
 ---
 Upstream-Status: Pending
 
@@ -25,7 +24,7 @@ Upstream-Status: Pending
  1 file changed, 17 insertions(+)
 
 diff --git a/src/device.c b/src/device.c
-index b43ced8b5..c2b145bbb 100644
+index 9b58e0c4e..021bd29ae 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -221,6 +221,7 @@ struct btd_device {
@@ -58,7 +57,7 @@ index b43ced8b5..c2b145bbb 100644
  static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
  							uint16_t *appearance)
  {
-@@ -3165,6 +3181,7 @@ static const GDBusMethodTable device_methods[] = {
+@@ -3168,6 +3184,7 @@ static const GDBusMethodTable device_methods[] = {
  static const GDBusPropertyTable device_properties[] = {
  	{ "Address", "s", dev_property_get_address },
  	{ "AddressType", "s", property_get_address_type },
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch
index 54b2ffeb8..407345114 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch
@@ -1,4 +1,4 @@
-From 6c4165e0d2a6b7cd66bfecf47247965e31a64fc7 Mon Sep 17 00:00:00 2001
+From 3fbf501d0ec36f6bc09036024cf3f6841f76d88d Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Sun, 22 Jul 2018 18:59:45 +0530
 Subject: [PATCH] Fix Gatt connect when device address type is BDADDR_LE_PUBLIC
@@ -30,10 +30,10 @@ Upstream-Status: Pending
  1 file changed, 28 insertions(+)
 
 diff --git a/src/device.c b/src/device.c
-index c2b145bbb..e8ba3e657 100644
+index 021bd29ae..60515b262 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2570,6 +2570,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
+@@ -2573,6 +2573,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
  	return connect_profiles(dev, bdaddr_type, msg, NULL);
  }
  
@@ -67,7 +67,7 @@ index c2b145bbb..e8ba3e657 100644
  static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
  							void *user_data)
  {
-@@ -3169,6 +3196,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
+@@ -3172,6 +3199,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
  static const GDBusMethodTable device_methods[] = {
  	{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
  	{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch
index b4a7d3540..d9f2f079f 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch
@@ -1,4 +1,4 @@
-From 5ddd1bcb73b5fba5b8c9471b7d28c11312604fc1 Mon Sep 17 00:00:00 2001
+From ff39243c4364ebef23186c92d171b849d5bda0a8 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Thu, 15 Nov 2018 11:08:44 +0530
 Subject: [PATCH] Use system bus instead of session for obexd
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch
index 73c2f912f..b0d0b6d02 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch
@@ -1,4 +1,4 @@
-From 8d707587ca71da13ffe694eef59c0e93cd0592a8 Mon Sep 17 00:00:00 2001
+From 2e8ad718a6b6432c3081d3e47a57626b23adda32 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Tue, 22 Jan 2019 23:25:18 +0530
 Subject: [PATCH] Implementation to get connected profiles uuids
@@ -25,7 +25,7 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 49 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index e8ba3e657..0cd1b849f 100644
+index 60515b262..43642d4f8 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -230,6 +230,7 @@ struct btd_device {
@@ -81,7 +81,7 @@ index e8ba3e657..0cd1b849f 100644
  
  	if (dev->pending == NULL)
  		goto done;
-@@ -2621,6 +2650,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
+@@ -2624,6 +2653,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
  static void device_profile_disconnected(struct btd_device *dev,
  					struct btd_profile *profile, int err)
  {
@@ -96,7 +96,7 @@ index e8ba3e657..0cd1b849f 100644
  	if (!dev->disconnect)
  		return;
  
-@@ -3226,6 +3263,7 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3229,6 +3266,7 @@ static const GDBusPropertyTable device_properties[] = {
  	{ "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi },
  	{ "Connected", "b", dev_property_get_connected },
  	{ "UUIDs", "as", dev_property_get_uuids },
@@ -104,7 +104,7 @@ index e8ba3e657..0cd1b849f 100644
  	{ "Modalias", "s", dev_property_get_modalias, NULL,
  						dev_property_exists_modalias },
  	{ "Adapter", "o", dev_property_get_adapter },
-@@ -3335,8 +3373,18 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
+@@ -3338,8 +3376,18 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
  	if (!state->connected)
  		return;
  
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch
index 0c1803e5a..11fec8b38 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch
@@ -1,4 +1,4 @@
-From a9c08b894fc01993f608ff3209ef8d4d57b4946a Mon Sep 17 00:00:00 2001
+From f7d101552edfd0c9aaa6c5c3b9cd223ee2c97d5e Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Sun, 13 Jan 2019 13:35:55 +0530
 Subject: [PATCH] recievePassThrough commad support required for webos
@@ -56,7 +56,7 @@ index 6f64f162b..b002470f9 100644
  		break;
  	}
 diff --git a/src/device.c b/src/device.c
-index 0cd1b849f..deb6ba705 100644
+index 43642d4f8..ec407a808 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -185,6 +185,11 @@ enum {
@@ -143,7 +143,7 @@ index 0cd1b849f..deb6ba705 100644
  static gboolean
  dev_property_service_data_exist(const GDBusPropertyTable *property,
  								void *data)
-@@ -2241,6 +2282,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
+@@ -2239,6 +2280,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
  	g_slist_foreach(list, add_manufacturer_data, dev);
  }
  
@@ -159,7 +159,7 @@ index 0cd1b849f..deb6ba705 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3269,6 +3319,8 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3272,6 +3322,8 @@ static const GDBusPropertyTable device_properties[] = {
  	{ "Adapter", "o", dev_property_get_adapter },
  	{ "ManufacturerData", "a{qv}", dev_property_get_manufacturer_data,
  				NULL, dev_property_manufacturer_data_exist },
@@ -168,7 +168,7 @@ index 0cd1b849f..deb6ba705 100644
  	{ "ServiceData", "a{sv}", dev_property_get_service_data,
  				NULL, dev_property_service_data_exist },
  	{ "TxPower", "n", dev_property_get_tx_power, NULL,
-@@ -4306,6 +4358,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4311,6 +4363,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
  	device->sirks = queue_new();
  	device->temporary = true;
  
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch
index 41c49722a..43da9fa7b 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch
@@ -1,4 +1,4 @@
-From 202850740ecc7f44c6e5a6fe24718e8f791049b9 Mon Sep 17 00:00:00 2001
+From eb311e605dbbf7f68f789e04a9c6b0f1570a96f5 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Wed, 30 Jan 2019 15:17:11 +0530
 Subject: [PATCH] Added dbus signal for MediaPlayRequest
@@ -49,10 +49,10 @@ index dda9a303f..4063650c7 100644
  }
  
 diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index bcf4eae26..595f79d91 100644
+index 66f512e00..3e3a1013a 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
-@@ -1890,7 +1890,7 @@ static uint32_t media_player_get_position(void *user_data)
+@@ -1913,7 +1913,7 @@ static uint32_t media_player_get_position(void *user_data)
  	sec = (uint32_t) timedelta;
  	msec = (uint32_t) ((timedelta - sec) * 1000);
  
@@ -62,10 +62,10 @@ index bcf4eae26..595f79d91 100644
  
  static uint32_t media_player_get_duration(void *user_data)
 diff --git a/src/device.c b/src/device.c
-index deb6ba705..0cc574346 100644
+index ec407a808..caa8c55ca 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2291,6 +2291,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
+@@ -2289,6 +2289,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
  					DEVICE_INTERFACE, "KeyCode");
  }
  
@@ -88,7 +88,7 @@ index deb6ba705..0cc574346 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3280,6 +3296,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
+@@ -3283,6 +3299,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
  	return dbus_message_new_method_return(msg);
  }
  
@@ -101,7 +101,7 @@ index deb6ba705..0cc574346 100644
  static const GDBusMethodTable device_methods[] = {
  	{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
  	{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
-@@ -4346,7 +4368,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4351,7 +4373,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
  
  	if (g_dbus_register_interface(dbus_conn,
  					device->path, DEVICE_INTERFACE,
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch
index 38a11f730..2959071d0 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch
@@ -1,4 +1,4 @@
-From 588270b04249ed2b9fd61aa2e59ebbf1fe444097 Mon Sep 17 00:00:00 2001
+From dcc06f3359fd20877f9b420044042a752ed14c24 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Tue, 5 Feb 2019 18:10:55 +0530
 Subject: [PATCH] avrcp getting remote device features list
@@ -80,7 +80,7 @@ index 4063650c7..f3f2009f4 100644
  }
  
 diff --git a/src/device.c b/src/device.c
-index 0cc574346..0adc0eab2 100644
+index caa8c55ca..fd26b6057 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -298,6 +298,8 @@ struct btd_device {
@@ -139,7 +139,7 @@ index 0cc574346..0adc0eab2 100644
  static gboolean
  dev_property_service_data_exist(const GDBusPropertyTable *property,
  								void *data)
-@@ -2307,6 +2349,25 @@ void media_metadata_request(struct btd_device *dev)
+@@ -2305,6 +2347,25 @@ void media_metadata_request(struct btd_device *dev)
  			DBUS_TYPE_INVALID);
  }
  
@@ -165,7 +165,7 @@ index 0cc574346..0adc0eab2 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3343,6 +3404,10 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3346,6 +3407,10 @@ static const GDBusPropertyTable device_properties[] = {
  				NULL, dev_property_manufacturer_data_exist },
  	{ "KeyCode", "a{sv}", dev_property_get_key_code,
  				NULL, dev_property_key_code_exist},
@@ -176,7 +176,7 @@ index 0cc574346..0adc0eab2 100644
  	{ "ServiceData", "a{sv}", dev_property_get_service_data,
  				NULL, dev_property_service_data_exist },
  	{ "TxPower", "n", dev_property_get_tx_power, NULL,
-@@ -4383,6 +4448,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4388,6 +4453,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
  	device->passththough_key.state = NULL;
  	device->passththough_key.key = NULL;
  
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch
index 69c120ff3..405d3fb43 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch
@@ -1,4 +1,4 @@
-From cfcc9db2cbe6897dc3d1ddf4a435b823e647bcea Mon Sep 17 00:00:00 2001
+From 97080c8fada63eec590c3ecea382f6498086abde Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Mon, 21 Jan 2019 12:44:19 +0530
 Subject: [PATCH] Fix volume property not able to set
@@ -26,10 +26,10 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
-index 77216e10b..16a0e5941 100644
+index dd923b03e..96fa29e7c 100644
 --- a/profiles/audio/transport.c
 +++ b/profiles/audio/transport.c
-@@ -1149,7 +1149,7 @@ static int media_transport_init_source(struct media_transport *transport)
+@@ -1333,7 +1333,7 @@ static int media_transport_init_source(struct media_transport *transport)
  	transport->data = a2dp;
  	transport->destroy = destroy_a2dp;
  
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch
index 40cfbdaa3..f6aae982d 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch
@@ -1,4 +1,4 @@
-From 2678b6b03f160a3afa50f376044297506edcf4f4 Mon Sep 17 00:00:00 2001
+From 73d7c3daf589588cd5ac728b72a676bcb37f4466 Mon Sep 17 00:00:00 2001
 From: Sameer Mulla <sameer.mulla@lge.com>
 Date: Tue, 10 Dec 2019 16:15:43 +0530
 Subject: [PATCH] Fix volume level notification not appearing after 127
@@ -20,7 +20,6 @@ Builded and Tested
 :Issues Addressed:
 [PLAT-97324] There is an environment where avrcp / getRemoteVolume
              does not return.
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -29,10 +28,10 @@ Upstream-Status: Inappropriate [webos specific]
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index 595f79d91..4568816db 100644
+index 3e3a1013a..d24329dcd 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
-@@ -1905,8 +1905,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
+@@ -1928,8 +1928,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
  {
  	struct media_player *mp = user_data;
  
@@ -44,10 +43,10 @@ index 595f79d91..4568816db 100644
  	mp->volume = volume;
  }
 diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
-index 16a0e5941..abbe77a90 100644
+index 96fa29e7c..f2ad172ef 100644
 --- a/profiles/audio/transport.c
 +++ b/profiles/audio/transport.c
-@@ -776,8 +776,8 @@ static void set_volume(const GDBusPropertyTable *property,
+@@ -779,8 +779,8 @@ static void set_volume(const GDBusPropertyTable *property,
  	}
  
  	volume = (int8_t)arg;
@@ -58,7 +57,7 @@ index 16a0e5941..abbe77a90 100644
  
  	notify = transport->source_watch ? true : false;
  	if (notify) {
-@@ -1661,8 +1661,8 @@ void media_transport_update_volume(struct media_transport *transport,
+@@ -1967,8 +1967,8 @@ void media_transport_update_volume(struct media_transport *transport,
  		return;
  
  	/* Check if volume really changed */
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch
index 43effd6ce..041edf73d 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch
@@ -1,4 +1,4 @@
-From 903589b617de2149962cc12e2f5f4fe68291c859 Mon Sep 17 00:00:00 2001
+From 00ad4e7209dff3c93e3febfa360044bdbcf7b031 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <sameer.mulla@lge.com>
 Date: Thu, 4 Jun 2020 04:49:48 +0000
 Subject: [PATCH] Support enabling avdtp delayReport
@@ -17,7 +17,6 @@ NA
 
 :Issues Addressed:
 [PLAT-98273] Implement AVDTP delay report interface
-
 ---
 Upstream-Status: Pending
 
@@ -35,10 +34,10 @@ Upstream-Status: Pending
  11 files changed, 97 insertions(+)
 
 diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
-index 47b5dd7c3..7865bce7f 100644
+index b43161a13..5ce43946b 100644
 --- a/profiles/audio/a2dp.c
 +++ b/profiles/audio/a2dp.c
-@@ -2390,6 +2390,14 @@ found:
+@@ -2391,6 +2391,14 @@ found:
  	return avdtp_ref(chan->session);
  }
  
@@ -91,7 +90,7 @@ index 102a2603e..b167f2dab 100644
  uint16_t avdtp_get_version(struct avdtp *session);
 +void avdtp_local_sep_set_delay_report(struct avdtp_local_sep *lsep, bool delay_reporting);
 diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index 4568816db..48fc1b280 100644
+index d24329dcd..63ee334c7 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
 @@ -132,6 +132,19 @@ struct media_player {
@@ -114,7 +113,7 @@ index 4568816db..48fc1b280 100644
  static void endpoint_request_free(struct endpoint_request *request)
  {
  	if (request->call)
-@@ -1414,6 +1427,9 @@ media_endpoint_create(struct media_adapter *adapter,
+@@ -1437,6 +1450,9 @@ media_endpoint_create(struct media_adapter *adapter,
  	}
  
  	endpoint->adapter = adapter;
@@ -124,7 +123,7 @@ index 4568816db..48fc1b280 100644
  
  	for (i = 0; i < ARRAY_SIZE(init_table); i++) {
  		init = &init_table[i];
-@@ -3204,6 +3220,7 @@ int media_register(struct btd_adapter *btd_adapter)
+@@ -3227,6 +3243,7 @@ int media_register(struct btd_adapter *btd_adapter)
  		return -1;
  	}
  
@@ -133,7 +132,7 @@ index 4568816db..48fc1b280 100644
  
  	return 0;
 diff --git a/profiles/audio/media.h b/profiles/audio/media.h
-index 1de84a8ff..f9e3ca309 100644
+index 0eeb5746a..ad33c8816 100644
 --- a/profiles/audio/media.h
 +++ b/profiles/audio/media.h
 @@ -10,6 +10,7 @@
@@ -144,13 +143,13 @@ index 1de84a8ff..f9e3ca309 100644
  
  typedef void (*media_endpoint_cb_t) (struct media_endpoint *endpoint,
  					void *ret, int size, void *user_data);
-@@ -24,3 +25,4 @@ struct btd_adapter *media_endpoint_get_btd_adapter(
- 					struct media_endpoint *endpoint);
- 
+@@ -25,3 +26,4 @@ struct btd_adapter *media_endpoint_get_btd_adapter(
+ bool media_endpoint_is_broadcast(
+ 	struct media_endpoint *endpoint);
  int8_t media_player_get_device_volume(struct btd_device *device);
 +void media_set_delay_reporting(struct media_adapter* adapter, bool delay_reporting);
 diff --git a/src/adapter.c b/src/adapter.c
-index 2679d4302..79663f675 100644
+index 5ebfc4752..e2b66e1d3 100644
 --- a/src/adapter.c
 +++ b/src/adapter.c
 @@ -67,6 +67,7 @@
@@ -161,7 +160,7 @@ index 2679d4302..79663f675 100644
  
  #define MODE_OFF		0x00
  #define MODE_CONNECTABLE	0x01
-@@ -280,6 +281,9 @@ struct btd_adapter {
+@@ -285,6 +286,9 @@ struct btd_adapter {
  	bool filtered_discovery;	/* we are doing filtered discovery */
  	bool no_scan_restart_delay;	/* when this flag is set, restart scan
  					 * without delay */
@@ -171,7 +170,7 @@ index 2679d4302..79663f675 100644
  	uint8_t discovery_type;		/* current active discovery type */
  	uint8_t discovery_enable;	/* discovery enabled/disabled */
  	bool discovery_suspended;	/* discovery has been suspended */
-@@ -357,6 +361,11 @@ typedef enum {
+@@ -363,6 +367,11 @@ typedef enum {
  	ADAPTER_AUTHORIZE_CHECK_CONNECTED
  } adapter_authorize_type;
  
@@ -183,7 +182,7 @@ index 2679d4302..79663f675 100644
  static struct btd_adapter *btd_adapter_lookup(uint16_t index)
  {
  	GList *list;
-@@ -559,6 +568,8 @@ static void store_adapter_info(struct btd_adapter *adapter)
+@@ -565,6 +574,8 @@ static void store_adapter_info(struct btd_adapter *adapter)
  
  	g_key_file_set_boolean(key_file, "General", "Discoverable",
  							discoverable);
@@ -192,7 +191,7 @@ index 2679d4302..79663f675 100644
  
  	if (adapter->discoverable_timeout != btd_opts.discovto)
  		g_key_file_set_integer(key_file, "General",
-@@ -3491,6 +3502,30 @@ static gboolean property_get_roles(const GDBusPropertyTable *property,
+@@ -3497,6 +3508,30 @@ static gboolean property_get_roles(const GDBusPropertyTable *property,
  
  	return TRUE;
  }
@@ -223,7 +222,7 @@ index 2679d4302..79663f675 100644
  
  static void property_append_experimental(void *data, void *user_data)
  {
-@@ -3895,6 +3930,7 @@ static const GDBusPropertyTable adapter_properties[] = {
+@@ -3898,6 +3933,7 @@ static const GDBusPropertyTable adapter_properties[] = {
  	{ "Roles", "as", property_get_roles },
  	{ "ExperimentalFeatures", "as", property_get_experimental, NULL,
  					property_experimental_exists },
@@ -231,7 +230,7 @@ index 2679d4302..79663f675 100644
  	{ }
  };
  
-@@ -5272,6 +5308,11 @@ bool btd_adapter_get_bredr(struct btd_adapter *adapter)
+@@ -5276,6 +5312,11 @@ bool btd_adapter_get_bredr(struct btd_adapter *adapter)
  	return false;
  }
  
@@ -243,7 +242,7 @@ index 2679d4302..79663f675 100644
  struct btd_gatt_database *btd_adapter_get_database(struct btd_adapter *adapter)
  {
  	if (!adapter)
-@@ -6801,6 +6842,15 @@ static void load_config(struct btd_adapter *adapter)
+@@ -6817,6 +6858,15 @@ static void load_config(struct btd_adapter *adapter)
  		gerr = NULL;
  	}
  
@@ -259,7 +258,7 @@ index 2679d4302..79663f675 100644
  	g_key_file_free(key_file);
  }
  
-@@ -6837,6 +6887,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)
+@@ -6853,6 +6903,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)
  						btd_opts.did_version);
  	adapter->discoverable_timeout = btd_opts.discovto;
  	adapter->pairable_timeout = btd_opts.pairto;
@@ -267,7 +266,7 @@ index 2679d4302..79663f675 100644
  
  	DBG("System name: %s", adapter->system_name);
  	DBG("Major class: %u", adapter->major_class);
-@@ -6847,6 +6898,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)
+@@ -6863,6 +6914,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)
  	if (blocked > 0)
  		DBG("Power state: %s",
  			adapter_power_state_str(adapter->power_state));
@@ -309,10 +308,10 @@ index b7e7ebd61..176689859 100644
  	uint16_t	did_source;
  	uint16_t	did_vendor;
 diff --git a/src/main.c b/src/main.c
-index 8dfd2543b..ae32c13ba 100644
+index 2134fcf75..a8cb58ffb 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -85,6 +85,7 @@ static const char *supported_options[] = {
+@@ -82,6 +82,7 @@ static const char *supported_options[] = {
  	"MultiProfile",
  	"FastConnectable",
  	"SecureConnections",
@@ -320,7 +319,7 @@ index 8dfd2543b..ae32c13ba 100644
  	"Privacy",
  	"JustWorksRepairing",
  	"TemporaryTimeout",
-@@ -1035,6 +1036,9 @@ static void parse_general(GKeyFile *config)
+@@ -1032,6 +1033,9 @@ static void parse_general(GKeyFile *config)
  	parse_config_u32(config, "General", "RemoteNameRequestRetryDelay",
  					&btd_opts.name_request_retry_delay,
  					0, UINT32_MAX);
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch
index f4507c5a7..44dde0a80 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch
@@ -1,4 +1,4 @@
-From c29efa91ed8d2e825512abb941f3d110344f805a Mon Sep 17 00:00:00 2001
+From 82067e84d1974b5b18e3c10f4d14ab8c5da7e464 Mon Sep 17 00:00:00 2001
 From: Rakes Pani <rakes.pani@lge.com>
 Date: Mon, 6 Apr 2020 12:14:43 +0530
 Subject: [PATCH] Implementation to get connectedUuid's in case of incoming
@@ -17,7 +17,6 @@ Builded and Tested
 
 :Issues Addressed:
 [PLAT-102289] Implement connect for A2DP_SINK
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -25,10 +24,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/device.c b/src/device.c
-index 0adc0eab2..791f2fb30 100644
+index fd26b6057..fa8d310b2 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -7405,9 +7405,11 @@ static void service_state_changed(struct btd_service *service,
+@@ -7414,9 +7414,11 @@ static void service_state_changed(struct btd_service *service,
  				new_state == BTD_SERVICE_STATE_DISCONNECTING)
  		return;
  
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch
index 4aee403fe..51e59b1d6 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch
@@ -1,4 +1,4 @@
-From 256c8406d4cb3dddae93d6239d3d9ccb74a33058 Mon Sep 17 00:00:00 2001
+From a81093c8a26b48e7b130ceccc65ac07731bc3be5 Mon Sep 17 00:00:00 2001
 From: "ramya.hegde" <ramya.hegde@lge.com>
 Date: Tue, 14 Apr 2020 15:28:07 +0530
 Subject: [PATCH] Fix for updating connected uuids when profile is disconnected
@@ -16,7 +16,6 @@ Builded and Tested
 
 :Issues Addressed:
 [PLAT-102923] Implement disconnect to AVRCP target
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -24,10 +23,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index 791f2fb30..1c72510d2 100644
+index fa8d310b2..8bb363d25 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2780,7 +2780,10 @@ static void device_profile_disconnected(struct btd_device *dev,
+@@ -2783,7 +2783,10 @@ static void device_profile_disconnected(struct btd_device *dev,
  	DBG("%s %s (%d)", profile->name, strerror(-err), -err);
  	if (!err) {
  		if (dev->connected_uuids)
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch
index e427d7551..b180b449f 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch
@@ -1,4 +1,4 @@
-From 02a0724630e4aeb3538fbda338fbe2a3ce2d0948 Mon Sep 17 00:00:00 2001
+From 06bb5e7e0def956438b6fa18ebbfd998821bfff8 Mon Sep 17 00:00:00 2001
 From: Sameer Mulla <sameer.mulla@lge.com>
 Date: Mon, 27 Apr 2020 11:56:21 +0530
 Subject: [PATCH] Fix device/getStatus not updated when unpaired
@@ -21,7 +21,6 @@ Builded and Tested
 
 :Issues Addressed:
 [PLAT-102335] Test and fix hfp/getStatus for multiple adapter
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -29,7 +28,7 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/device.c b/src/device.c
-index 1c72510d2..1e0cbaf28 100644
+index 8bb363d25..cdec9900a 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -2203,13 +2203,13 @@ static void device_profile_connected(struct btd_device *dev,
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch
index a5514ac50..1e306d530 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch
@@ -1,4 +1,4 @@
-From 2e3b1df36a6621550363009190d3aba4d9079ee5 Mon Sep 17 00:00:00 2001
+From 9888f1084506eb02f4c30078c60080f1967a4dc0 Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Mon, 20 Apr 2020 19:24:45 +0900
 Subject: [PATCH] Set default pairing capability as "NoInputNoOutput"
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch
index 4c5e66fdf..5ce823621 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch
@@ -1,4 +1,4 @@
-From 46bc38654877f72af0e02d8301fc325797e29664 Mon Sep 17 00:00:00 2001
+From 5ea04c913ef3358446d19fda94ea0e79069405b7 Mon Sep 17 00:00:00 2001
 From: "ramya.hegde" <ramya.hegde@lge.com>
 Date: Mon, 11 May 2020 15:54:12 +0530
 Subject: [PATCH] AVRCP getting supported notification events
@@ -18,7 +18,6 @@ Built and Tested
 :Issues Addressed:
 [PLAT-102247] [AVRCP CT] Implement
               avrcp/internal/getSupportedNotificationEvents
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -39,7 +38,7 @@ index f3f2009f4..4f17740da 100644
  	if (!session->controller || !session->controller->player)
  		return FALSE;
 diff --git a/src/device.c b/src/device.c
-index 1e0cbaf28..0bc362260 100644
+index cdec9900a..b9a28ef05 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -300,6 +300,7 @@ struct btd_device {
@@ -68,7 +67,7 @@ index 1e0cbaf28..0bc362260 100644
  static gboolean dev_property_get_avrcp_ct_feature(const GDBusPropertyTable *property,
  					DBusMessageIter *iter, void *data)
  {
-@@ -2368,6 +2380,14 @@ void set_avrcp_feature(struct btd_device *dev, uint8_t feature, bool is_controll
+@@ -2366,6 +2378,14 @@ void set_avrcp_feature(struct btd_device *dev, uint8_t feature, bool is_controll
  	}
  }
  
@@ -83,7 +82,7 @@ index 1e0cbaf28..0bc362260 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3411,6 +3431,7 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3414,6 +3434,7 @@ static const GDBusPropertyTable device_properties[] = {
  				NULL, dev_property_avrcp_ct_feature_exist},
  	{ "AvrcpTGFeatures", "y", dev_property_get_avrcp_tg_feature,
  				NULL, dev_property_avrcp_tg_feature_exist},
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch
index 9d2e662ad..fe980e8b0 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch
@@ -1,4 +1,4 @@
-From 690515be2839c4c2df837483a26efcf23a39b936 Mon Sep 17 00:00:00 2001
+From 548ebf6070926a927b3511a41324f113685b8f68 Mon Sep 17 00:00:00 2001
 From: Rakes Pani <rakes.pani@lge.com>
 Date: Tue, 14 Jul 2020 10:37:18 +0900
 Subject: [PATCH] Modified MapInstanceName & MapInstanceProperties parsing and
@@ -17,7 +17,6 @@ NA
 
 :Issues Addressed:
 [PLAT-107882] Implement BlueZ API support for MAP connection support
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -25,7 +24,7 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 167 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index 0bc362260..4fdc63dab 100644
+index b9a28ef05..7e94e505a 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -235,6 +235,8 @@ struct btd_device {
@@ -147,7 +146,7 @@ index 0bc362260..4fdc63dab 100644
  static gboolean dev_property_get_modalias(const GDBusPropertyTable *property,
  					DBusMessageIter *iter, void *data)
  {
-@@ -3448,6 +3525,8 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3451,6 +3528,8 @@ static const GDBusPropertyTable device_properties[] = {
  				dev_property_wake_allowed_exist },
  	{ "Sets", "a{oa{sv}}", dev_property_get_set, NULL,
  				dev_property_set_exists },
@@ -156,7 +155,7 @@ index 0bc362260..4fdc63dab 100644
  	{ }
  };
  
-@@ -3825,6 +3904,32 @@ static void load_services(struct btd_device *device, char **uuids)
+@@ -3828,6 +3907,32 @@ static void load_services(struct btd_device *device, char **uuids)
  	g_strfreev(uuids);
  }
  
@@ -189,7 +188,7 @@ index 0bc362260..4fdc63dab 100644
  static void convert_info(struct btd_device *device, GKeyFile *key_file)
  {
  	char filename[PATH_MAX];
-@@ -3877,7 +3982,7 @@ static void load_info(struct btd_device *device, const char *local,
+@@ -3880,7 +3985,7 @@ static void load_info(struct btd_device *device, const char *local,
  	gboolean store_needed = FALSE;
  	gboolean blocked;
  	gboolean wake_allowed;
@@ -198,7 +197,7 @@ index 0bc362260..4fdc63dab 100644
  	int source, vendor, product, version;
  	char **techno, **t;
  
-@@ -3975,6 +4080,23 @@ next:
+@@ -3978,6 +4083,23 @@ next:
  		device->bredr_state.svc_resolved = true;
  	}
  
@@ -222,7 +221,7 @@ index 0bc362260..4fdc63dab 100644
  	/* Load device id */
  	source = g_key_file_get_integer(key_file, "DeviceID", "Source", NULL);
  	if (source) {
-@@ -5267,6 +5389,29 @@ static int update_record(struct browse_req *req, const char *uuid,
+@@ -5280,6 +5402,29 @@ static int update_record(struct browse_req *req, const char *uuid,
  	return 0;
  }
  
@@ -252,7 +251,7 @@ index 0bc362260..4fdc63dab 100644
  static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
  {
  	struct btd_device *device = req->device;
-@@ -5324,6 +5469,23 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
+@@ -5337,6 +5482,23 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
  		if (!profile_uuid)
  			continue;
  
@@ -276,7 +275,7 @@ index 0bc362260..4fdc63dab 100644
  		if (bt_uuid_strcmp(profile_uuid, PNP_UUID) == 0) {
  			uint16_t source, vendor, product, version;
  			sdp_data_t *pdlist;
-@@ -5502,6 +5664,10 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data)
+@@ -5515,6 +5677,10 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data)
  	/* Propagate services changes */
  	g_dbus_emit_property_changed(dbus_conn, req->device->path,
  						DEVICE_INTERFACE, "UUIDs");
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch
index 9f46ec1bb..9e1af8783 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch
@@ -1,4 +1,4 @@
-From e6bcdf470c18203b87a6c480b35307ef328e71d5 Mon Sep 17 00:00:00 2001
+From 0e3a0d8d8f854bc5ac38978d0199d1fdaa035dfa Mon Sep 17 00:00:00 2001
 From: Rakes Pani <rakes.pani@lge.com>
 Date: Wed, 3 Jun 2020 18:08:39 +0530
 Subject: [PATCH] Enabled EMAIL support based on MAPInstance Name Modified
@@ -16,7 +16,6 @@ Subject: [PATCH] Enabled EMAIL support based on MAPInstance Name Modified
 
 :Issues Addressed:
     [PLAT-107882] Implement BlueZ API support for MAP connection support
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch
index ee1134258..554061829 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch
@@ -1,4 +1,4 @@
-From 8c3287d73a4db8b5b027135d76b33a5d01248e39 Mon Sep 17 00:00:00 2001
+From d8d5b1de4d9a08fc5d3a4976029739334090dddd Mon Sep 17 00:00:00 2001
 From: Vibhanshu Dhote <vibhanshu.dhote@lge.com>
 Date: Tue, 28 Jul 2020 16:04:27 +0530
 Subject: [PATCH] Disabling DB Hash for Gatt
@@ -15,7 +15,6 @@ NA
 :Issues Addressed:
 [PLAT-107885] Analyze and Adopt the changes for BlueZ 5.54 apis for
               GATT profile
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -23,10 +22,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gatt-database.c b/src/gatt-database.c
-index 01dd84e8e..b6c23260b 100644
+index 7221ffc87..1fb4b8f35 100644
 --- a/src/gatt-database.c
 +++ b/src/gatt-database.c
-@@ -1191,11 +1191,13 @@ static void db_hash_read_cb(struct gatt_db_attribute *attrib,
+@@ -1207,11 +1207,13 @@ static void db_hash_read_cb(struct gatt_db_attribute *attrib,
  
  	hash = gatt_db_get_hash(database->db);
  
@@ -41,7 +40,7 @@ index 01dd84e8e..b6c23260b 100644
  	state = find_device_state(database, &bdaddr, bdaddr_type);
  	if (state)
  		state->change_aware = true;
-@@ -1252,6 +1254,7 @@ static void populate_gatt_service(struct btd_gatt_database *database)
+@@ -1268,6 +1270,7 @@ static void populate_gatt_service(struct btd_gatt_database *database)
  	gatt_db_attribute_set_fixed_length(database->cli_feat, CLI_FEAT_SIZE);
  
  	/* Only expose database hash chrc if supported */
@@ -49,7 +48,7 @@ index 01dd84e8e..b6c23260b 100644
  	if (gatt_db_hash_support(database->db)) {
  		bt_uuid16_create(&uuid, GATT_CHARAC_DB_HASH);
  		database->db_hash = gatt_db_service_add_characteristic(service,
-@@ -1259,6 +1262,7 @@ static void populate_gatt_service(struct btd_gatt_database *database)
+@@ -1275,6 +1278,7 @@ static void populate_gatt_service(struct btd_gatt_database *database)
  				db_hash_read_cb, NULL, database);
  		gatt_db_attribute_set_fixed_length(database->db_hash, 16);
  	}
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch
index d855bb91a..fad92a6b2 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch
@@ -1,4 +1,4 @@
-From eb92042e9dc87cc9c4b6f6573cf81d77b97db9d9 Mon Sep 17 00:00:00 2001
+From 8d107719002670d2e34fa74bb247675742689fd7 Mon Sep 17 00:00:00 2001
 From: Rakes Pani <rakes.pani@lge.com>
 Date: Fri, 7 Aug 2020 18:32:03 +0530
 Subject: [PATCH] Added Notification property in org.bluez.obex.MessageAccess1
@@ -14,7 +14,6 @@ NA
 
 :Issues Addressed:
 [PLAT-107891] Implement BlueZ API for getMessageNotificationEvent
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch
index ec1558972..991591d9e 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch
@@ -1,4 +1,4 @@
-From ad458e4e6fc4f14f2448f161b7a17e51f797feaa Mon Sep 17 00:00:00 2001
+From 133fc1ac84d46d4442faf1d0ce7e331065fd44da Mon Sep 17 00:00:00 2001
 From: Rakes Pani <rakes.pani@lge.com>
 Date: Mon, 10 Aug 2020 13:27:14 +0530
 Subject: [PATCH] Added MessageHandle property in org.bluez.obex.Transfer1
@@ -15,7 +15,6 @@ NA
 
 :Issues Addressed:
 [PLAT-107873] Add MessageHandle for pushMessage transfer in Bluez5
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch
index 75415a1bc..fe6c28a46 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch
@@ -1,4 +1,4 @@
-From e9fde8c10e451c635a517f6f5d10823a0b485bd5 Mon Sep 17 00:00:00 2001
+From 7a118d8801bf88553eea261843c821566319b11c Mon Sep 17 00:00:00 2001
 From: Rakes Pani <rakes.pani@lge.com>
 Date: Mon, 10 Aug 2020 16:21:17 +0530
 Subject: [PATCH] Create Message interface for sent message related
@@ -16,7 +16,6 @@ NA
 
 :Issues Addressed:
 [PLAT-107873] Add MessageHandle for pushMessage transfer in Bluez5
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch
index 3f1c2404e..f61dbc1af 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch
@@ -1,4 +1,4 @@
-From 37b47fb0be2cc526aaa3588db65e0af96df2b08d Mon Sep 17 00:00:00 2001
+From 6c9a518901ba85f83832b1a9894235b2f04b8825 Mon Sep 17 00:00:00 2001
 From: "ramya.hegde" <ramya.hegde@lge.com>
 Date: Tue, 11 Aug 2020 15:18:43 +0530
 Subject: [PATCH] AVRCP addToNowPlaying return error when player not supports
@@ -17,7 +17,6 @@ NA
 :Issues Addressed:
 [PLAT-110696] Analyze and fix addToNowPlaying support in
               bluez5 stack
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch
index a0cfdc273..6926f6d42 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch
@@ -1,4 +1,4 @@
-From 6bfa67eef487053ad5d33770939321d50c5e81cd Mon Sep 17 00:00:00 2001
+From 8e150fd9ff159f4b7b823fa1c42bcc22015e2bea Mon Sep 17 00:00:00 2001
 From: "ramya.hegde" <ramya.hegde@lge.com>
 Date: Tue, 3 Nov 2020 11:32:38 +0530
 Subject: [PATCH] AVRCP MediaItem object path fix
@@ -19,7 +19,6 @@ NA
 :Issues Addressed:
 [PLAT-124915] Calling AVRCP search API results in
               icom.webos.service.bluetooth2 crash
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch
index 51b1a9e4d..1f74f298e 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch
@@ -1,4 +1,4 @@
-From 67564af7c0b82b4f0278c2033c0c58415d1d223a Mon Sep 17 00:00:00 2001
+From 84eff351c480c39571be806267188e2450e65d35 Mon Sep 17 00:00:00 2001
 From: Sameer Mulla <sameer.mulla@lge.com>
 Date: Thu, 12 Nov 2020 15:04:36 +0530
 Subject: [PATCH] Revert "a2dp: Add reverse discovery"
@@ -21,7 +21,6 @@ Builded and Tested
 
 :QA Notes:
 NA
-
 ---
 Upstream-Status: Pending
 
@@ -29,10 +28,10 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+), 13 deletions(-)
 
 diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
-index 7865bce7f..3fac6207f 100644
+index 5ce43946b..2bbf3aad0 100644
 --- a/profiles/audio/a2dp.c
 +++ b/profiles/audio/a2dp.c
-@@ -633,12 +633,6 @@ static gboolean endpoint_match_codec_ind(struct avdtp *session,
+@@ -634,12 +634,6 @@ static gboolean endpoint_match_codec_ind(struct avdtp *session,
  	return TRUE;
  }
  
@@ -45,7 +44,7 @@ index 7865bce7f..3fac6207f 100644
  static gboolean endpoint_setconf_ind(struct avdtp *session,
  						struct avdtp_local_sep *sep,
  						struct avdtp_stream *stream,
-@@ -694,14 +688,8 @@ static gboolean endpoint_setconf_ind(struct avdtp *session,
+@@ -695,14 +689,8 @@ static gboolean endpoint_setconf_ind(struct avdtp *session,
  						setup_ref(setup),
  						endpoint_setconf_cb,
  						a2dp_sep->user_data);
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch
index bc7b3c38d..73c08cf5c 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch
@@ -1,4 +1,4 @@
-From 9109eaae4e2fd040ec5344fa6461ca53246f12ac Mon Sep 17 00:00:00 2001
+From 15f90c1ce644fc1121c68b1224a0f2f659bb29bf Mon Sep 17 00:00:00 2001
 From: "ramya.hegde" <ramya.hegde@lge.com>
 Date: Mon, 25 Jan 2021 16:27:58 +0530
 Subject: [PATCH] Add support for meshd to use RAW channel
@@ -25,7 +25,6 @@ NA
 :Issues Addressed:
 [PLAT-123995] Analyze bluetooth-meshd and bluetoothd
               working together
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch
index 6082c8d8b..2eedee5c4 100644
--- a/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch
+++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch
@@ -1,4 +1,4 @@
-From 5e24c460a043a5e120095a2470273470c51ffeb2 Mon Sep 17 00:00:00 2001
+From 0cd6b0a0d3b2a5ee7ce356b9e0a4f790514b668e Mon Sep 17 00:00:00 2001
 From: "shoyeb.khan" <shoyeb.khan@lge.com>
 Date: Wed, 27 Jan 2021 03:34:27 +0530
 Subject: [PATCH] Enable mesh & fixed ell undefined symbol error
@@ -18,7 +18,6 @@ NA
 
 :Issues Addressed:
 [PLAT-131628] Enable mesh with Bluez 5.55 in WebOS OSE
-
 ---
 Upstream-Status: Inappropriate [webos specific]
 
@@ -26,7 +25,7 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 17623b103..99c55455a 100644
+index 93931d121..d9a2d2921 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -698,7 +698,7 @@ ell/internal: Makefile