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 webosose#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 webosose#3 succeeded at 367 (offset 6 lines).
Hunk webosose#4 succeeded at 574 (offset 6 lines).
Hunk webosose#5 succeeded at 3508 (offset 6 lines).
Hunk webosose#6 succeeded at 3933 (offset 3 lines).
Hunk webosose#7 succeeded at 5312 (offset 4 lines).
Hunk webosose#8 succeeded at 6858 (offset 16 lines).
Hunk webosose#9 succeeded at 6903 (offset 16 lines).
Hunk webosose#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

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,

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
 

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,15 +17,14 @@ 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
 
  src/device.c | 17 +++++++++++++++++
  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 },

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) },

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

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,15 +96,15 @@ 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 },
 +	{ "ConnectedUUIDS", "as", dev_property_get_connected_uuids },
  	{ "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;
 

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;
 

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,

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;
 

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;
 

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 */