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 f195bce44..dfad95aea 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 3edb60015a4e93e25ac223c657f9477b9f48ece0 Mon Sep 17 00:00:00 2001
+From a3f6c02d722b9de76bdefb438e06d6e06bd74087 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,10 +26,10 @@ Upstream-Status: Pending
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/src/advertising.c b/src/advertising.c
-index f9748b132..694447057 100644
+index 0dceb14c3..761d4d0bd 100644
 --- a/src/advertising.c
 +++ b/src/advertising.c
-@@ -525,13 +525,18 @@ static bool parse_local_name(DBusMessageIter *iter,
+@@ -569,13 +569,18 @@ static bool parse_local_name(DBusMessageIter *iter,
  	if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING)
  		return false;
  
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 8ab512565..6b8d31a43 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 67c89b925334a3f41f4b85ce9e1a1dd5d5e2822f Mon Sep 17 00:00:00 2001
+From a5cc25ac4190a532a13d888169e019464c93d24f 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
@@ -27,7 +27,7 @@ Upstream-Status: Pending
  1 file changed, 4 insertions(+)
 
 diff --git a/src/profile.c b/src/profile.c
-index e1bebf1ee..36a999c7a 100644
+index ea188f36b..3be107768 100644
 --- a/src/profile.c
 +++ b/src/profile.c
 @@ -727,6 +727,8 @@ static GSList *custom_props = NULL;
@@ -39,7 +39,7 @@ index e1bebf1ee..36a999c7a 100644
  void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data),
  								void *data)
  {
-@@ -867,6 +869,8 @@ drop:
+@@ -873,6 +875,8 @@ drop:
  			btd_service_disconnecting_complete(conn->service, 0);
  	}
  
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 b09f459a6..53fe5ba59 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 a2064617fa5db4c5ad4120133406f8e3de1fdb9c Mon Sep 17 00:00:00 2001
+From a7acbee5a412370fbf0e26e1895162315e023ec5 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
@@ -25,10 +25,10 @@ Upstream-Status: Pending
  1 file changed, 17 insertions(+)
 
 diff --git a/src/device.c b/src/device.c
-index 995d39f2c..b1fe7fd7c 100644
+index b43ced8b5..c2b145bbb 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -206,6 +206,7 @@ struct btd_device {
+@@ -221,6 +221,7 @@ struct btd_device {
  	char		name[MAX_NAME_LENGTH + 1];
  	char		*alias;
  	uint32_t	class;
@@ -36,7 +36,7 @@ index 995d39f2c..b1fe7fd7c 100644
  	uint16_t	vendor_src;
  	uint16_t	vendor;
  	uint16_t	product;
-@@ -964,6 +965,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
+@@ -1020,6 +1021,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
  	return TRUE;
  }
  
@@ -58,7 +58,7 @@ index 995d39f2c..b1fe7fd7c 100644
  static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
  							uint16_t *appearance)
  {
-@@ -2961,6 +2977,7 @@ static const GDBusMethodTable device_methods[] = {
+@@ -3165,6 +3181,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 7aa1c9be7..54b2ffeb8 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 9acc3246d1c47383edf4dfee3054734f9adf09ae Mon Sep 17 00:00:00 2001
+From 6c4165e0d2a6b7cd66bfecf47247965e31a64fc7 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 b1fe7fd7c..bda45dfdf 100644
+index c2b145bbb..e8ba3e657 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2366,6 +2366,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
+@@ -2570,6 +2570,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
  	return connect_profiles(dev, bdaddr_type, msg, NULL);
  }
  
@@ -67,7 +67,7 @@ index b1fe7fd7c..bda45dfdf 100644
  static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
  							void *user_data)
  {
-@@ -2965,6 +2992,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
+@@ -3169,6 +3196,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 568ebe695..b4a7d3540 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 ff6dc50e04ada7f717139cf7b1adb29863e0efb8 Mon Sep 17 00:00:00 2001
+From 5ddd1bcb73b5fba5b8c9471b7d28c11312604fc1 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
@@ -127,10 +127,10 @@ index f5a9d9ae8..88f412aba 100644
  	if (conn == NULL)
  		return FALSE;
 diff --git a/obexd/src/manager.c b/obexd/src/manager.c
-index 01741fe62..f1fa9fa43 100644
+index 73fd6b9af..04294921a 100644
 --- a/obexd/src/manager.c
 +++ b/obexd/src/manager.c
-@@ -486,7 +486,7 @@ gboolean manager_init(void)
+@@ -488,7 +488,7 @@ gboolean manager_init(void)
  
  	dbus_error_init(&err);
  
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 d06db5c4d..73c2f912f 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 87032726d8ab8fdbb172ce098560c1fd80a7e184 Mon Sep 17 00:00:00 2001
+From 8d707587ca71da13ffe694eef59c0e93cd0592a8 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,10 +25,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 49 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index bda45dfdf..750232410 100644
+index e8ba3e657..0cd1b849f 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -215,6 +215,7 @@ struct btd_device {
+@@ -230,6 +230,7 @@ struct btd_device {
  	char		*modalias;
  	struct btd_adapter	*adapter;
  	GSList		*uuids;
@@ -36,7 +36,7 @@ index bda45dfdf..750232410 100644
  	GSList		*primaries;		/* List of primary services */
  	GSList		*services;		/* List of btd_service */
  	GSList		*pending;		/* Pending services */
-@@ -996,6 +997,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
+@@ -1052,6 +1053,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
  	return FALSE;
  }
  
@@ -65,7 +65,7 @@ index bda45dfdf..750232410 100644
  static gboolean dev_property_exists_appearance(
  			const GDBusPropertyTable *property, void *data)
  {
-@@ -1893,8 +1916,14 @@ static void device_profile_connected(struct btd_device *dev,
+@@ -2097,8 +2120,14 @@ static void device_profile_connected(struct btd_device *dev,
  
  	DBG("%s %s (%d)", profile->name, strerror(-err), -err);
  
@@ -81,7 +81,7 @@ index bda45dfdf..750232410 100644
  
  	if (dev->pending == NULL)
  		goto done;
-@@ -2417,6 +2446,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
+@@ -2621,6 +2650,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 bda45dfdf..750232410 100644
  	if (!dev->disconnect)
  		return;
  
-@@ -3022,6 +3059,7 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3226,6 +3263,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 bda45dfdf..750232410 100644
  	{ "Modalias", "s", dev_property_get_modalias, NULL,
  						dev_property_exists_modalias },
  	{ "Adapter", "o", dev_property_get_adapter },
-@@ -3129,8 +3167,18 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
+@@ -3335,8 +3373,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 640167221..0c1803e5a 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 30b1947069401365ed1fe5ff5531e7cca6f15d3b Mon Sep 17 00:00:00 2001
+From a9c08b894fc01993f608ff3209ef8d4d57b4946a 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,10 +56,10 @@ index 6f64f162b..b002470f9 100644
  		break;
  	}
 diff --git a/src/device.c b/src/device.c
-index 750232410..07dad435b 100644
+index 0cd1b849f..deb6ba705 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -170,6 +170,11 @@ enum {
+@@ -185,6 +185,11 @@ enum {
  	WAKE_FLAG_DISABLED,
  };
  
@@ -71,7 +71,7 @@ index 750232410..07dad435b 100644
  struct btd_device {
  	int ref_count;
  
-@@ -275,6 +280,8 @@ struct btd_device {
+@@ -291,6 +296,8 @@ struct btd_device {
  	time_t		name_resolve_failed_time;
  
  	int8_t		volume;
@@ -80,7 +80,7 @@ index 750232410..07dad435b 100644
  };
  
  static const uint16_t uuid_list[] = {
-@@ -1407,6 +1414,18 @@ dev_property_manufacturer_data_exist(const GDBusPropertyTable *property,
+@@ -1463,6 +1470,18 @@ dev_property_manufacturer_data_exist(const GDBusPropertyTable *property,
  	return bt_ad_has_manufacturer_data(device->ad, NULL);
  }
  
@@ -99,7 +99,7 @@ index 750232410..07dad435b 100644
  static void append_service_data(void *data, void *user_data)
  {
  	struct bt_ad_service_data *sd = data;
-@@ -1425,13 +1444,13 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
+@@ -1481,13 +1500,13 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
  	struct btd_device *device = data;
  	DBusMessageIter dict;
  
@@ -114,7 +114,7 @@ index 750232410..07dad435b 100644
  	bt_ad_foreach_service_data(device->ad, append_service_data, &dict);
  
  	dbus_message_iter_close_container(iter, &dict);
-@@ -1439,6 +1458,28 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
+@@ -1495,6 +1514,28 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
  	return TRUE;
  }
  
@@ -143,7 +143,7 @@ index 750232410..07dad435b 100644
  static gboolean
  dev_property_service_data_exist(const GDBusPropertyTable *property,
  								void *data)
-@@ -2037,6 +2078,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
+@@ -2241,6 +2282,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 750232410..07dad435b 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3065,6 +3115,8 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3269,6 +3319,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,8 +168,8 @@ index 750232410..07dad435b 100644
  	{ "ServiceData", "a{sv}", dev_property_get_service_data,
  				NULL, dev_property_service_data_exist },
  	{ "TxPower", "n", dev_property_get_tx_power, NULL,
-@@ -4040,6 +4092,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
- 	device->adapter = adapter;
+@@ -4306,6 +4358,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+ 	device->sirks = queue_new();
  	device->temporary = true;
  
 +	device->passththough_key.state = NULL;
@@ -179,12 +179,12 @@ index 750232410..07dad435b 100644
  					gatt_service_removed, device, NULL);
  
 diff --git a/src/device.h b/src/device.h
-index 9e81fda9e..6297e04c0 100644
+index 3252e14ef..9dcb3c140 100644
 --- a/src/device.h
 +++ b/src/device.h
-@@ -188,3 +188,5 @@ void btd_device_cleanup(void);
+@@ -196,3 +196,5 @@ typedef void (*bt_device_ad_func_t)(void *data, void *user_data);
  
- void btd_device_set_volume(struct btd_device *dev, int8_t volume);
- int8_t btd_device_get_volume(struct btd_device *dev);
+ void btd_device_foreach_ad(struct btd_device *dev, bt_device_ad_func_t func,
+ 							void *data);
 +
 +void recieve_passThrough_commands(struct btd_device *dev, const char* code, const char* state);
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 922b5ecc9..41c49722a 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 a329e8a0fb56137887aa80717c288559093da568 Mon Sep 17 00:00:00 2001
+From 202850740ecc7f44c6e5a6fe24718e8f791049b9 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
@@ -29,7 +29,7 @@ Upstream-Status: Inappropriate [webos specific]
  4 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
-index 80f34c7a7..1b3e6090a 100644
+index dda9a303f..4063650c7 100644
 --- a/profiles/audio/avrcp.c
 +++ b/profiles/audio/avrcp.c
 @@ -1240,6 +1240,7 @@ static uint8_t avrcp_handle_get_element_attributes(struct avrcp *session,
@@ -49,10 +49,10 @@ index 80f34c7a7..1b3e6090a 100644
  }
  
 diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index c9328ab9b..bea2e6358 100644
+index bcf4eae26..595f79d91 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
-@@ -1761,7 +1761,7 @@ static uint32_t media_player_get_position(void *user_data)
+@@ -1890,7 +1890,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 c9328ab9b..bea2e6358 100644
  
  static uint32_t media_player_get_duration(void *user_data)
 diff --git a/src/device.c b/src/device.c
-index 07dad435b..3f9f1190d 100644
+index deb6ba705..0cc574346 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2087,6 +2087,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
+@@ -2291,6 +2291,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
  					DEVICE_INTERFACE, "KeyCode");
  }
  
@@ -88,7 +88,7 @@ index 07dad435b..3f9f1190d 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3076,6 +3092,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
+@@ -3280,6 +3296,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
  	return dbus_message_new_method_return(msg);
  }
  
@@ -101,7 +101,7 @@ index 07dad435b..3f9f1190d 100644
  static const GDBusMethodTable device_methods[] = {
  	{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
  	{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
-@@ -4081,7 +4103,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4346,7 +4368,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
  
  	if (g_dbus_register_interface(dbus_conn,
  					device->path, DEVICE_INTERFACE,
@@ -111,11 +111,11 @@ index 07dad435b..3f9f1190d 100644
  					device_free) == FALSE) {
  		error("Unable to register device interface for %s", address);
 diff --git a/src/device.h b/src/device.h
-index 6297e04c0..549e53b81 100644
+index 9dcb3c140..ae54e71cf 100644
 --- a/src/device.h
 +++ b/src/device.h
-@@ -190,3 +190,6 @@ void btd_device_set_volume(struct btd_device *dev, int8_t volume);
- int8_t btd_device_get_volume(struct btd_device *dev);
+@@ -198,3 +198,6 @@ void btd_device_foreach_ad(struct btd_device *dev, bt_device_ad_func_t func,
+ 							void *data);
  
  void recieve_passThrough_commands(struct btd_device *dev, const char* code, const char* state);
 +
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 acf71abf1..38a11f730 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 4564bd613eb15b23f1c8fd9b5aca3a2aaeb179c1 Mon Sep 17 00:00:00 2001
+From 588270b04249ed2b9fd61aa2e59ebbf1fe444097 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
@@ -29,10 +29,10 @@ Upstream-Status: Inappropriate [webos specific]
  3 files changed, 88 insertions(+)
 
 diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
-index 1b3e6090a..61478e913 100644
+index 4063650c7..f3f2009f4 100644
 --- a/profiles/audio/avrcp.c
 +++ b/profiles/audio/avrcp.c
-@@ -4152,9 +4152,16 @@ static void target_init(struct avrcp *session)
+@@ -4158,9 +4158,16 @@ static void target_init(struct avrcp *session)
  				(1 << AVRCP_EVENT_TRACK_REACHED_END) |
  				(1 << AVRCP_EVENT_SETTINGS_CHANGED);
  
@@ -49,7 +49,7 @@ index 1b3e6090a..61478e913 100644
  	session->supported_events |=
  				(1 << AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED) |
  				(1 << AVRCP_EVENT_AVAILABLE_PLAYERS_CHANGED) |
-@@ -4167,6 +4174,8 @@ static void target_init(struct avrcp *session)
+@@ -4173,6 +4180,8 @@ static void target_init(struct avrcp *session)
  	if (!(target->features & AVRCP_FEATURE_BROWSING))
  		return;
  
@@ -58,7 +58,7 @@ index 1b3e6090a..61478e913 100644
  	avrcp_connect_browsing(session);
  }
  
-@@ -4197,14 +4206,20 @@ static void controller_init(struct avrcp *session)
+@@ -4203,14 +4212,20 @@ static void controller_init(struct avrcp *session)
  	if (controller->version < 0x0103)
  		return;
  
@@ -80,10 +80,10 @@ index 1b3e6090a..61478e913 100644
  }
  
 diff --git a/src/device.c b/src/device.c
-index 3f9f1190d..efe3a636f 100644
+index 0cc574346..0adc0eab2 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -282,6 +282,8 @@ struct btd_device {
+@@ -298,6 +298,8 @@ struct btd_device {
  	int8_t		volume;
  
  	struct key_code passththough_key;
@@ -92,7 +92,7 @@ index 3f9f1190d..efe3a636f 100644
  };
  
  static const uint16_t uuid_list[] = {
-@@ -1480,6 +1482,46 @@ static gboolean dev_property_get_key_code(const GDBusPropertyTable *property,
+@@ -1536,6 +1538,46 @@ static gboolean dev_property_get_key_code(const GDBusPropertyTable *property,
  	return TRUE;
  }
  
@@ -139,7 +139,7 @@ index 3f9f1190d..efe3a636f 100644
  static gboolean
  dev_property_service_data_exist(const GDBusPropertyTable *property,
  								void *data)
-@@ -2103,6 +2145,25 @@ void media_metadata_request(struct btd_device *dev)
+@@ -2307,6 +2349,25 @@ void media_metadata_request(struct btd_device *dev)
  			DBUS_TYPE_INVALID);
  }
  
@@ -165,7 +165,7 @@ index 3f9f1190d..efe3a636f 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3139,6 +3200,10 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3343,6 +3404,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 3f9f1190d..efe3a636f 100644
  	{ "ServiceData", "a{sv}", dev_property_get_service_data,
  				NULL, dev_property_service_data_exist },
  	{ "TxPower", "n", dev_property_get_tx_power, NULL,
-@@ -4117,6 +4182,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4383,6 +4448,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
  	device->passththough_key.state = NULL;
  	device->passththough_key.key = NULL;
  
@@ -187,7 +187,7 @@ index 3f9f1190d..efe3a636f 100644
  					gatt_service_removed, device, NULL);
  
 diff --git a/src/device.h b/src/device.h
-index 549e53b81..3fcfd919d 100644
+index ae54e71cf..6856177d6 100644
 --- a/src/device.h
 +++ b/src/device.h
 @@ -10,6 +10,10 @@
@@ -201,7 +201,7 @@ index 549e53b81..3fcfd919d 100644
  
  struct btd_device;
  
-@@ -193,3 +197,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
+@@ -201,3 +205,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
  
  void media_play_request(struct btd_device *dev);
  void media_metadata_request(struct btd_device *dev);
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 800222332..69c120ff3 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 91af1c0af8c0b0c15c02b577290a60e15cabed1d Mon Sep 17 00:00:00 2001
+From cfcc9db2cbe6897dc3d1ddf4a435b823e647bcea 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 41339da51..2827ff42d 100644
+index 77216e10b..16a0e5941 100644
 --- a/profiles/audio/transport.c
 +++ b/profiles/audio/transport.c
-@@ -1065,7 +1065,7 @@ static int media_transport_init_source(struct media_transport *transport)
+@@ -1149,7 +1149,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 623b04004..40cfbdaa3 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 66089ff883a5904898c4e7810422a5035d9f41b7 Mon Sep 17 00:00:00 2001
+From 2678b6b03f160a3afa50f376044297506edcf4f4 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
@@ -29,10 +29,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 bea2e6358..a9c42450c 100644
+index 595f79d91..4568816db 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
-@@ -1776,8 +1776,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
+@@ -1905,8 +1905,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
  {
  	struct media_player *mp = user_data;
  
@@ -44,11 +44,11 @@ index bea2e6358..a9c42450c 100644
  	mp->volume = volume;
  }
 diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
-index 2827ff42d..f9c1a4a16 100644
+index 16a0e5941..abbe77a90 100644
 --- a/profiles/audio/transport.c
 +++ b/profiles/audio/transport.c
-@@ -749,8 +749,8 @@ static void set_volume(const GDBusPropertyTable *property,
- 	g_dbus_pending_property_success(id);
+@@ -776,8 +776,8 @@ static void set_volume(const GDBusPropertyTable *property,
+ 	}
  
  	volume = (int8_t)arg;
 -	if (a2dp->volume == volume)
@@ -58,7 +58,7 @@ index 2827ff42d..f9c1a4a16 100644
  
  	notify = transport->source_watch ? true : false;
  	if (notify) {
-@@ -1517,8 +1517,8 @@ void media_transport_update_volume(struct media_transport *transport,
+@@ -1661,8 +1661,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 f02c1c8b5..43effd6ce 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 7c3eb3855096453d6f59d9d3b55a22c1d3ba4c3c Mon Sep 17 00:00:00 2001
+From 903589b617de2149962cc12e2f5f4fe68291c859 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
@@ -30,9 +30,9 @@ Upstream-Status: Pending
  src/adapter.c          | 52 ++++++++++++++++++++++++++++++++++++++++++
  src/adapter.h          |  3 +++
  src/btd.h              |  1 +
- src/main.c             | 11 +++++++++
+ src/main.c             |  4 ++++
  src/main.conf          |  3 +++
- 11 files changed, 104 insertions(+)
+ 11 files changed, 97 insertions(+)
 
 diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
 index 47b5dd7c3..7865bce7f 100644
@@ -91,10 +91,10 @@ 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 a9c42450c..3f147b697 100644
+index 4568816db..48fc1b280 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
-@@ -128,6 +128,19 @@ struct media_player {
+@@ -132,6 +132,19 @@ struct media_player {
  
  static GSList *adapters = NULL;
  
@@ -114,7 +114,7 @@ index a9c42450c..3f147b697 100644
  static void endpoint_request_free(struct endpoint_request *request)
  {
  	if (request->call)
-@@ -1314,6 +1327,9 @@ media_endpoint_create(struct media_adapter *adapter,
+@@ -1414,6 +1427,9 @@ media_endpoint_create(struct media_adapter *adapter,
  	}
  
  	endpoint->adapter = adapter;
@@ -124,7 +124,7 @@ index a9c42450c..3f147b697 100644
  
  	for (i = 0; i < ARRAY_SIZE(init_table); i++) {
  		init = &init_table[i];
-@@ -3050,6 +3066,7 @@ int media_register(struct btd_adapter *btd_adapter)
+@@ -3204,6 +3220,7 @@ int media_register(struct btd_adapter *btd_adapter)
  		return -1;
  	}
  
@@ -133,7 +133,7 @@ index a9c42450c..3f147b697 100644
  
  	return 0;
 diff --git a/profiles/audio/media.h b/profiles/audio/media.h
-index 96bea9db4..e9d10fd3c 100644
+index 1de84a8ff..f9e3ca309 100644
 --- a/profiles/audio/media.h
 +++ b/profiles/audio/media.h
 @@ -10,6 +10,7 @@
@@ -144,13 +144,13 @@ index 96bea9db4..e9d10fd3c 100644
  
  typedef void (*media_endpoint_cb_t) (struct media_endpoint *endpoint,
  					void *ret, int size, void *user_data);
-@@ -22,3 +23,4 @@ const char *media_endpoint_get_uuid(struct media_endpoint *endpoint);
- uint8_t media_endpoint_get_codec(struct media_endpoint *endpoint);
+@@ -24,3 +25,4 @@ struct btd_adapter *media_endpoint_get_btd_adapter(
+ 					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 8fb2acdc8..f22f17508 100644
+index 2679d4302..79663f675 100644
 --- a/src/adapter.c
 +++ b/src/adapter.c
 @@ -67,6 +67,7 @@
@@ -192,7 +192,7 @@ index 8fb2acdc8..f22f17508 100644
  
  	if (adapter->discoverable_timeout != btd_opts.discovto)
  		g_key_file_set_integer(key_file, "General",
-@@ -3476,6 +3487,30 @@ static gboolean property_get_roles(const GDBusPropertyTable *property,
+@@ -3491,6 +3502,30 @@ static gboolean property_get_roles(const GDBusPropertyTable *property,
  
  	return TRUE;
  }
@@ -223,7 +223,7 @@ index 8fb2acdc8..f22f17508 100644
  
  static void property_append_experimental(void *data, void *user_data)
  {
-@@ -3880,6 +3915,7 @@ static const GDBusPropertyTable adapter_properties[] = {
+@@ -3895,6 +3930,7 @@ static const GDBusPropertyTable adapter_properties[] = {
  	{ "Roles", "as", property_get_roles },
  	{ "ExperimentalFeatures", "as", property_get_experimental, NULL,
  					property_experimental_exists },
@@ -231,7 +231,7 @@ index 8fb2acdc8..f22f17508 100644
  	{ }
  };
  
-@@ -5257,6 +5293,11 @@ bool btd_adapter_get_bredr(struct btd_adapter *adapter)
+@@ -5272,6 +5308,11 @@ bool btd_adapter_get_bredr(struct btd_adapter *adapter)
  	return false;
  }
  
@@ -243,7 +243,7 @@ index 8fb2acdc8..f22f17508 100644
  struct btd_gatt_database *btd_adapter_get_database(struct btd_adapter *adapter)
  {
  	if (!adapter)
-@@ -6786,6 +6827,15 @@ static void load_config(struct btd_adapter *adapter)
+@@ -6801,6 +6842,15 @@ static void load_config(struct btd_adapter *adapter)
  		gerr = NULL;
  	}
  
@@ -259,7 +259,7 @@ index 8fb2acdc8..f22f17508 100644
  	g_key_file_free(key_file);
  }
  
-@@ -6822,6 +6872,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)
+@@ -6837,6 +6887,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 +267,7 @@ index 8fb2acdc8..f22f17508 100644
  
  	DBG("System name: %s", adapter->system_name);
  	DBG("Major class: %u", adapter->major_class);
-@@ -6832,6 +6883,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)
+@@ -6847,6 +6898,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));
@@ -276,7 +276,7 @@ index 8fb2acdc8..f22f17508 100644
  	adapter->auths = g_queue_new();
  	adapter->exps = queue_new();
 diff --git a/src/adapter.h b/src/adapter.h
-index 78eb069ae..3da7816f2 100644
+index ca96c1f65..908cba088 100644
 --- a/src/adapter.h
 +++ b/src/adapter.h
 @@ -26,6 +26,7 @@
@@ -297,48 +297,41 @@ index 78eb069ae..3da7816f2 100644
  struct btd_gatt_database *btd_adapter_get_database(struct btd_adapter *adapter);
  
 diff --git a/src/btd.h b/src/btd.h
-index 63be6d8d4..c3f9013b5 100644
+index b7e7ebd61..176689859 100644
 --- a/src/btd.h
 +++ b/src/btd.h
-@@ -115,6 +115,7 @@ struct btd_opts {
- 	gboolean	refresh_discovery;
- 	gboolean	experimental;
+@@ -129,6 +129,7 @@ struct btd_opts {
+ 	bool		refresh_discovery;
+ 	bool		experimental;
  	struct queue	*kernel;
 +	gboolean	delay_report;
  
  	uint16_t	did_source;
  	uint16_t	did_vendor;
 diff --git a/src/main.c b/src/main.c
-index 1d357161f..b120a3de3 100644
+index 8dfd2543b..ae32c13ba 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -80,6 +80,7 @@ static const char *supported_options[] = {
- 	"MaxControllers"
+@@ -85,6 +85,7 @@ static const char *supported_options[] = {
  	"MultiProfile",
  	"FastConnectable",
+ 	"SecureConnections",
 +        "DelayReport",
  	"Privacy",
  	"JustWorksRepairing",
  	"TemporaryTimeout",
-@@ -881,6 +882,16 @@ static void parse_config(GKeyFile *config)
- 		btd_opts.name_request_retry_delay = val;
- 	}
- 
-+        boolean = g_key_file_get_boolean(config, "General",
-+                                               "DelayReport", &err);
-+        if (err)
-+                g_clear_error(&err);
-+        else
-+        {
-+                DBG("DelayReport=%d", boolean);
-+                btd_opts.delay_report = boolean;
-+        }
+@@ -1035,6 +1036,9 @@ static void parse_general(GKeyFile *config)
+ 	parse_config_u32(config, "General", "RemoteNameRequestRetryDelay",
+ 					&btd_opts.name_request_retry_delay,
+ 					0, UINT32_MAX);
 +
- 	str = g_key_file_get_string(config, "GATT", "Cache", &err);
- 	if (err) {
- 		DBG("%s", err->message);
++	parse_config_bool(config, "General", "DelayReport",
++					&btd_opts.delay_report);
+ }
+ 
+ static void parse_gatt_cache(GKeyFile *config)
 diff --git a/src/main.conf b/src/main.conf
-index 2796f155e..0c6af35fe 100644
+index d108934a8..81225861c 100644
 --- a/src/main.conf
 +++ b/src/main.conf
 @@ -69,6 +69,9 @@
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 93e39fe66..f4507c5a7 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 6e5c3988e30450c0babc68686b0c34c2c878ee2e Mon Sep 17 00:00:00 2001
+From c29efa91ed8d2e825512abb941f3d110344f805a 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
@@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/device.c b/src/device.c
-index efe3a636f..e921261c1 100644
+index 0adc0eab2..791f2fb30 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -7121,9 +7121,11 @@ static void service_state_changed(struct btd_service *service,
+@@ -7405,9 +7405,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 a7e01948d..4aee403fe 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 8c291a6536ea7376d509f9fc4fd624c6e585c4f5 Mon Sep 17 00:00:00 2001
+From 256c8406d4cb3dddae93d6239d3d9ccb74a33058 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
@@ -24,10 +24,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index e921261c1..79874cdbc 100644
+index 791f2fb30..1c72510d2 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2576,7 +2576,10 @@ static void device_profile_disconnected(struct btd_device *dev,
+@@ -2780,7 +2780,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 fc5598821..e427d7551 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 4edeb82908ed6b0a443893b9ba5bbe0dc82462ca Mon Sep 17 00:00:00 2001
+From 02a0724630e4aeb3538fbda338fbe2a3ce2d0948 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
@@ -29,10 +29,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/device.c b/src/device.c
-index 79874cdbc..be4b1d670 100644
+index 1c72510d2..1e0cbaf28 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -1999,13 +1999,13 @@ static void device_profile_connected(struct btd_device *dev,
+@@ -2203,13 +2203,13 @@ static void device_profile_connected(struct btd_device *dev,
  
  	DBG("%s %s (%d)", profile->name, strerror(-err), -err);
  
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 b834e8aae..a5514ac50 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 152936938e500f4234810636b340af367f649aae Mon Sep 17 00:00:00 2001
+From 2e3b1df36a6621550363009190d3aba4d9079ee5 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 93c9629de..4c5e66fdf 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 9c23c9ab97a20f41e0e49b61809ab0e528fb3f37 Mon Sep 17 00:00:00 2001
+From 46bc38654877f72af0e02d8301fc325797e29664 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
@@ -27,10 +27,10 @@ Upstream-Status: Inappropriate [webos specific]
  2 files changed, 22 insertions(+)
 
 diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
-index 61478e913..ff9d9f97d 100644
+index f3f2009f4..4f17740da 100644
 --- a/profiles/audio/avrcp.c
 +++ b/profiles/audio/avrcp.c
-@@ -3992,6 +3992,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn, uint8_t code,
+@@ -3998,6 +3998,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn, uint8_t code,
  			break;
  		}
  	}
@@ -39,10 +39,10 @@ index 61478e913..ff9d9f97d 100644
  	if (!session->controller || !session->controller->player)
  		return FALSE;
 diff --git a/src/device.c b/src/device.c
-index be4b1d670..06863a304 100644
+index 1e0cbaf28..0bc362260 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -284,6 +284,7 @@ struct btd_device {
+@@ -300,6 +300,7 @@ struct btd_device {
  	struct key_code passththough_key;
  	uint8_t		avrcp_ct_features;
  	uint8_t		avrcp_tg_features;
@@ -50,7 +50,7 @@ index be4b1d670..06863a304 100644
  };
  
  static const uint16_t uuid_list[] = {
-@@ -1482,6 +1483,17 @@ static gboolean dev_property_get_key_code(const GDBusPropertyTable *property,
+@@ -1538,6 +1539,17 @@ static gboolean dev_property_get_key_code(const GDBusPropertyTable *property,
  	return TRUE;
  }
  
@@ -68,7 +68,7 @@ index be4b1d670..06863a304 100644
  static gboolean dev_property_get_avrcp_ct_feature(const GDBusPropertyTable *property,
  					DBusMessageIter *iter, void *data)
  {
-@@ -2164,6 +2176,14 @@ void set_avrcp_feature(struct btd_device *dev, uint8_t feature, bool is_controll
+@@ -2368,6 +2380,14 @@ void set_avrcp_feature(struct btd_device *dev, uint8_t feature, bool is_controll
  	}
  }
  
@@ -83,7 +83,7 @@ index be4b1d670..06863a304 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3207,6 +3227,7 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3411,6 +3431,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 f767127aa..9d2e662ad 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 2aa47e4e4e88b83c3a9a524fc21e69535ec56815 Mon Sep 17 00:00:00 2001
+From 690515be2839c4c2df837483a26efcf23a39b936 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
@@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 167 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index 06863a304..7eed7d739 100644
+index 0bc362260..4fdc63dab 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -220,6 +220,8 @@ struct btd_device {
+@@ -235,6 +235,8 @@ struct btd_device {
  	char		*modalias;
  	struct btd_adapter	*adapter;
  	GSList		*uuids;
@@ -37,7 +37,7 @@ index 06863a304..7eed7d739 100644
  	GSList		*connected_uuids;
  	GSList		*primaries;		/* List of primary services */
  	GSList		*services;		/* List of btd_service */
-@@ -408,6 +410,7 @@ static gboolean store_device_info_cb(gpointer user_data)
+@@ -449,6 +451,7 @@ static gboolean store_device_info_cb(gpointer user_data)
  	char *str;
  	char class[9];
  	char **uuids = NULL;
@@ -45,7 +45,7 @@ index 06863a304..7eed7d739 100644
  	gsize length = 0;
  
  	device->store_id = 0;
-@@ -476,6 +479,35 @@ static gboolean store_device_info_cb(gpointer user_data)
+@@ -517,6 +520,35 @@ static gboolean store_device_info_cb(gpointer user_data)
  		g_key_file_remove_key(key_file, "General", "Services", NULL);
  	}
  
@@ -81,7 +81,7 @@ index 06863a304..7eed7d739 100644
  	if (device->vendor_src) {
  		g_key_file_set_integer(key_file, "DeviceID", "Source",
  					device->vendor_src);
-@@ -506,6 +538,7 @@ static gboolean store_device_info_cb(gpointer user_data)
+@@ -559,6 +591,7 @@ static gboolean store_device_info_cb(gpointer user_data)
  
  	g_key_file_free(key_file);
  	g_free(uuids);
@@ -89,7 +89,7 @@ index 06863a304..7eed7d739 100644
  
  	return FALSE;
  }
-@@ -775,6 +808,10 @@ static void device_free(gpointer user_data)
+@@ -828,6 +861,10 @@ static void device_free(gpointer user_data)
  	g_slist_free_full(device->uuids, g_free);
  	g_slist_free_full(device->primaries, g_free);
  	g_slist_free_full(device->svc_callbacks, svc_dev_remove);
@@ -100,7 +100,7 @@ index 06863a304..7eed7d739 100644
  
  	/* Reset callbacks since the device is going to be freed */
  	gatt_db_unregister(device->db, device->db_id);
-@@ -1343,6 +1380,46 @@ static gboolean dev_property_get_uuids(const GDBusPropertyTable *property,
+@@ -1399,6 +1436,46 @@ static gboolean dev_property_get_uuids(const GDBusPropertyTable *property,
  	return TRUE;
  }
  
@@ -147,16 +147,16 @@ index 06863a304..7eed7d739 100644
  static gboolean dev_property_get_modalias(const GDBusPropertyTable *property,
  					DBusMessageIter *iter, void *data)
  {
-@@ -3242,6 +3319,8 @@ static const GDBusPropertyTable device_properties[] = {
- 	{ "WakeAllowed", "b", dev_property_get_wake_allowed,
- 				dev_property_set_wake_allowed,
+@@ -3448,6 +3525,8 @@ static const GDBusPropertyTable device_properties[] = {
  				dev_property_wake_allowed_exist },
+ 	{ "Sets", "a{oa{sv}}", dev_property_get_set, NULL,
+ 				dev_property_set_exists },
 +        { "MapInstances", "as", dev_property_get_mapInstances },
 +        { "MapInstanceProperties", "ai", dev_property_get_mapInstanceProperties },
  	{ }
  };
  
-@@ -3562,6 +3641,32 @@ static void load_services(struct btd_device *device, char **uuids)
+@@ -3825,6 +3904,32 @@ static void load_services(struct btd_device *device, char **uuids)
  	g_strfreev(uuids);
  }
  
@@ -189,7 +189,7 @@ index 06863a304..7eed7d739 100644
  static void convert_info(struct btd_device *device, GKeyFile *key_file)
  {
  	char filename[PATH_MAX];
-@@ -3614,7 +3719,7 @@ static void load_info(struct btd_device *device, const char *local,
+@@ -3877,7 +3982,7 @@ static void load_info(struct btd_device *device, const char *local,
  	gboolean store_needed = FALSE;
  	gboolean blocked;
  	gboolean wake_allowed;
@@ -198,7 +198,7 @@ index 06863a304..7eed7d739 100644
  	int source, vendor, product, version;
  	char **techno, **t;
  
-@@ -3710,6 +3815,23 @@ next:
+@@ -3975,6 +4080,23 @@ next:
  		device->bredr_state.svc_resolved = true;
  	}
  
@@ -222,7 +222,7 @@ index 06863a304..7eed7d739 100644
  	/* Load device id */
  	source = g_key_file_get_integer(key_file, "DeviceID", "Source", NULL);
  	if (source) {
-@@ -4998,6 +5120,29 @@ static int update_record(struct browse_req *req, const char *uuid,
+@@ -5267,6 +5389,29 @@ static int update_record(struct browse_req *req, const char *uuid,
  	return 0;
  }
  
@@ -252,7 +252,7 @@ index 06863a304..7eed7d739 100644
  static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
  {
  	struct btd_device *device = req->device;
-@@ -5055,6 +5200,23 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
+@@ -5324,6 +5469,23 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
  		if (!profile_uuid)
  			continue;
  
@@ -276,7 +276,7 @@ index 06863a304..7eed7d739 100644
  		if (bt_uuid_strcmp(profile_uuid, PNP_UUID) == 0) {
  			uint16_t source, vendor, product, version;
  			sdp_data_t *pdlist;
-@@ -5233,6 +5395,10 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data)
+@@ -5502,6 +5664,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 006d9db16..9f46ec1bb 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 e32a29502c661bb74e314a70bbc167fb4ede9f70 Mon Sep 17 00:00:00 2001
+From e6bcdf470c18203b87a6c480b35307ef328e71d5 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
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 63dde1be0..ee1134258 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 9ea25f1fd32f0be2772a89ea1fc9ff6f6250560d Mon Sep 17 00:00:00 2001
+From 8c3287d73a4db8b5b027135d76b33a5d01248e39 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
@@ -23,7 +23,7 @@ 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 ea282d4bc..803dad80d 100644
+index 01dd84e8e..b6c23260b 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,
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 53e4863e0..d855bb91a 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 2d0708acce4d8edd5614325325afc311773f05d2 Mon Sep 17 00:00:00 2001
+From eb92042e9dc87cc9c4b6f6573cf81d77b97db9d9 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
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 63dc22874..ec1558972 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 e4ead3bf22f422ecb327a8a07c690e9273f81b26 Mon Sep 17 00:00:00 2001
+From ad458e4e6fc4f14f2448f161b7a17e51f797feaa 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
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 da9d846b2..75415a1bc 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 069f04c2d5435dc33ac103b410e545200168a49c Mon Sep 17 00:00:00 2001
+From e9fde8c10e451c635a517f6f5d10823a0b485bd5 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
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 e2f3cb130..3f1c2404e 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 ec240da85d250db9d33dbb8a72893516fed80c9c Mon Sep 17 00:00:00 2001
+From 37b47fb0be2cc526aaa3588db65e0af96df2b08d 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
@@ -27,7 +27,7 @@ Upstream-Status: Inappropriate [webos specific]
  3 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
-index ff9d9f97d..85db0883a 100644
+index 4f17740da..86b45bf37 100644
 --- a/profiles/audio/avrcp.c
 +++ b/profiles/audio/avrcp.c
 @@ -2901,6 +2901,9 @@ static void avrcp_player_parse_features(struct avrcp_player *player,
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 2533fb84c..a0cfdc273 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 372e5c5baa5ed2936c833cfb567cd85e0d08f361 Mon Sep 17 00:00:00 2001
+From 6bfa67eef487053ad5d33770939321d50c5e81cd 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
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 96b5135f3..51b1a9e4d 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 3175e56e54dd30e78131be257bd9ffc116cc7d40 Mon Sep 17 00:00:00 2001
+From 67564af7c0b82b4f0278c2033c0c58415d1d223a 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"
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 fd7aec106..bc7b3c38d 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 c17b168d8b7c2a55f5f085662bc5905caea23086 Mon Sep 17 00:00:00 2001
+From 9109eaae4e2fd040ec5344fa6461ca53246f12ac 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
@@ -52,7 +52,7 @@ index c8afbf53e..ee65ce485 100644
  LimitNPROC=1
  ProtectHome=true
 diff --git a/mesh/main.c b/mesh/main.c
-index 3bca020a0..b807fc0e7 100644
+index 145bcfa98..489bbef64 100644
 --- a/mesh/main.c
 +++ b/mesh/main.c
 @@ -36,6 +36,7 @@ static const char *storage_dir;
@@ -71,7 +71,7 @@ index 3bca020a0..b807fc0e7 100644
  	{ "help",	no_argument,		NULL, 'h' },
  	{ }
  };
-@@ -175,10 +177,11 @@ static bool parse_io(const char *optarg, enum mesh_io_type *type, void **opts)
+@@ -164,10 +166,11 @@ static bool parse_io(const char *optarg, enum mesh_io_type *type, void **opts)
  
  		return false;
  	} else if (strstr(optarg, "generic") == optarg) {
@@ -85,8 +85,8 @@ index 3bca020a0..b807fc0e7 100644
 -		*opts = index;
  
  		optarg += strlen("generic");
- 		if (!*optarg) {
-@@ -241,7 +244,7 @@ int main(int argc, char *argv[])
+ 		if (!*optarg || *optarg != ':')
+@@ -225,7 +228,7 @@ int main(int argc, char *argv[])
  	for (;;) {
  		int opt;
  
@@ -95,7 +95,7 @@ index 3bca020a0..b807fc0e7 100644
  									NULL);
  		if (opt < 0)
  			break;
-@@ -276,6 +279,9 @@ int main(int argc, char *argv[])
+@@ -260,6 +263,9 @@ int main(int argc, char *argv[])
  		case 'b':
  			dbus_debug = true;
  			break;
@@ -106,18 +106,18 @@ index 3bca020a0..b807fc0e7 100644
  			usage();
  			status = EXIT_SUCCESS;
 diff --git a/mesh/mesh-io-generic.c b/mesh/mesh-io-generic.c
-index 827128ec8..e9630e083 100644
+index 00932ade7..f50d282f7 100644
 --- a/mesh/mesh-io-generic.c
 +++ b/mesh/mesh-io-generic.c
-@@ -39,6 +39,7 @@ struct mesh_io_private {
+@@ -38,6 +38,7 @@ struct mesh_io_private {
  	uint16_t interval;
  	bool sending;
  	bool active;
 +	bool use_raw;
  };
  
- struct pvt_rx_reg {
-@@ -258,8 +259,11 @@ static void configure_hci(struct mesh_io_private *io)
+ struct process_data {
+@@ -250,8 +251,11 @@ static void configure_hci(struct mesh_io_private *io)
  
  	/* TODO: Move to suitable place. Set suitable masks */
  	/* Reset Command */
@@ -131,9 +131,9 @@ index 827128ec8..e9630e083 100644
  
  	/* Read local supported commands */
  	bt_hci_send(io->hci, BT_HCI_CMD_READ_LOCAL_COMMANDS, NULL, 0,
-@@ -388,7 +392,22 @@ static void hci_init(void *user_data)
- 	if (io->pvt->hci)
- 		bt_hci_unref(io->pvt->hci);
+@@ -383,7 +387,22 @@ static void hci_init(void *user_data)
+ 	/* Clear controller HCI list to suppress mgmt interface warnings */
+ 	mesh_mgmt_clear();
  
 -	io->pvt->hci = bt_hci_new_user_channel(io->index);
 +	if (io->pvt->use_raw)
@@ -155,7 +155,7 @@ index 827128ec8..e9630e083 100644
  	if (!io->pvt->hci) {
  		l_error("Failed to start mesh io (hci %u): %s", io->index,
  							strerror(errno));
-@@ -416,6 +435,10 @@ static bool dev_init(struct mesh_io *io, void *opts, void *user_data)
+@@ -411,6 +430,10 @@ static bool dev_init(struct mesh_io *io, void *opts, void *user_data)
  		return false;
  
  	io->pvt = l_new(struct mesh_io_private, 1);
@@ -164,10 +164,10 @@ index 827128ec8..e9630e083 100644
 +	io->index = io_opts->index;
 +	io->pvt->use_raw = io_opts->use_raw;
  
- 	io->pvt->rx_regs = l_queue_new();
  	io->pvt->tx_pkts = l_queue_new();
-@@ -822,7 +845,8 @@ static bool recv_register(struct mesh_io *io, const uint8_t *filter,
- 	if (l_queue_find(pvt->rx_regs, find_active, NULL))
+ 
+@@ -787,7 +810,8 @@ static bool recv_register(struct mesh_io *io, const uint8_t *filter,
+ 	if (l_queue_find(io->rx_regs, find_active, NULL))
  		active = true;
  
 -	if (!already_scanning || pvt->active != active) {
@@ -177,10 +177,10 @@ index 827128ec8..e9630e083 100644
  		cmd.enable = 0x00;	/* Disable scanning */
  		cmd.filter_dup = 0x00;	/* Report duplicates */
 diff --git a/mesh/mesh-io.h b/mesh/mesh-io.h
-index 9dd946cdf..ed067abe6 100644
+index f7711e786..17195e4ad 100644
 --- a/mesh/mesh-io.h
 +++ b/mesh/mesh-io.h
-@@ -32,6 +32,10 @@ struct mesh_io_recv_info {
+@@ -30,6 +30,10 @@ struct mesh_io_recv_info {
  	uint8_t chan;
  	int8_t rssi;
  };
@@ -192,7 +192,7 @@ index 9dd946cdf..ed067abe6 100644
  struct mesh_io_send_info {
  	enum mesh_io_timing_type type;
 diff --git a/mesh/mesh-mgmt.c b/mesh/mesh-mgmt.c
-index d37aeb5ac..eb7831cc5 100644
+index fd21a168a..8c599a01c 100644
 --- a/mesh/mesh-mgmt.c
 +++ b/mesh/mesh-mgmt.c
 @@ -86,6 +86,45 @@ static void set_exp_mesh_cb(uint8_t status, uint16_t length,
@@ -242,11 +242,11 @@ index d37aeb5ac..eb7831cc5 100644
  					const void *param, void *user_data)
  {
 diff --git a/mesh/mesh-mgmt.h b/mesh/mesh-mgmt.h
-index a3cd72faf..6dde5c725 100644
+index 570282297..d72d82ae3 100644
 --- a/mesh/mesh-mgmt.h
 +++ b/mesh/mesh-mgmt.h
-@@ -22,3 +22,4 @@ unsigned int mesh_mgmt_register(uint16_t event, uint16_t index,
- 				void *user_data, mgmt_destroy_func_t destroy);
+@@ -23,3 +23,4 @@ unsigned int mesh_mgmt_register(uint16_t event, uint16_t index,
  bool mesh_mgmt_unregister(unsigned int id);
  void mesh_mgmt_destroy(void);
+ void mesh_mgmt_clear(void);
 +bool set_powered(uint16_t mode, int index);
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 300a1f77c..6082c8d8b 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 38b36da247b14a48179260320948ad6cd51c24d0 Mon Sep 17 00:00:00 2001
+From 5e24c460a043a5e120095a2470273470c51ffeb2 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
@@ -26,10 +26,10 @@ Upstream-Status: Inappropriate [webos specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 7041f8eeb..87adacff9 100644
+index 17623b103..99c55455a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -683,7 +683,7 @@ ell/internal: Makefile
+@@ -698,7 +698,7 @@ ell/internal: Makefile
  		fi \
  	done > $@