webos: bluez5 (refresh patches to apply on 5.68 version)

:Release Notes:

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

ERROR: Applying patch '0007-recievePassThrough-commad-support-required-for-webos.patch' on target directory 'TOPDIR/BUILD/work/qemux86_64-webos-linux/bluez5/5.68-r0/bluez-5.68'
CmdError('quilt --quiltrc TOPDIR/BUILD/work/qemux86_64-webos-linux/bluez5/5.68-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0007-recievePassThrough-commad-support-required-for-webos.patch
patching file profiles/audio/avctp.c
patching file src/device.c
Hunk #1 succeeded at 185 (offset 15 lines).
Hunk #2 succeeded at 296 (offset 16 lines).
Hunk webosose#3 succeeded at 1470 (offset 56 lines).
Hunk webosose#4 succeeded at 1500 (offset 56 lines).
Hunk webosose#5 succeeded at 1514 (offset 56 lines).
Hunk webosose#6 succeeded at 2282 (offset 204 lines).
Hunk webosose#7 succeeded at 3319 (offset 204 lines).
Hunk webosose#8 succeeded at 4358 with fuzz 1 (offset 266 lines).
patching file src/device.h
Hunk #1 FAILED at 188.
1 out of 1 hunk FAILED -- rejects in file src/device.h
Patch 0007-recievePassThrough-commad-support-required-for-webos.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

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

Change-Id: Icff9a7f0dde24b38cdaca5911196a85a5d0aa471

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;
 

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

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,18 +25,18 @@ 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;
 +	uint32_t	devicetype;
  	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 },

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

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);
 

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

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);

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);
 +