From: Injun Yang <injun.yang@samsung.com>
Date: Wed, 30 Nov 2016 05:21:58 +0000 (+0900)
Subject: Handling non-flag adv data
X-Git-Tag: submit/tizen/20161205.050350~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F101492%2F1;p=platform%2Fupstream%2Fbluez.git

Handling non-flag adv data

[Problem] Unable to find scan result which have non flag adv data
[Cause & Measure] Even though the adv flag field is not included,
  deliver it to bt service. Same with android behavior
[Checking Method] BLE Scanning

Change-Id: Ifbc85bedbe3edb38c5a2f0f588465ffc2ca07fcc
Signed-off-by: Injun Yang <injun.yang@samsung.com>
---

diff --git a/src/adapter.c b/src/adapter.c
index ab0be45..a3c4850 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -9815,7 +9815,11 @@ static void update_found_devices(struct btd_adapter *adapter,
 {
 	struct btd_device *dev;
 	struct eir_data eir_data;
+#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
 	bool name_known, discoverable;
+#else
+	bool name_known;
+#endif
 #ifdef TIZEN_FEATURE_PLATFROM_SCAN_FILTER
 	uint8_t allow_report;
 #endif
@@ -9823,12 +9827,12 @@ static void update_found_devices(struct btd_adapter *adapter,
 
 	memset(&eir_data, 0, sizeof(eir_data));
 	eir_parse(&eir_data, data, data_len);
-
+#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
 	if (bdaddr_type == BDADDR_BREDR)
 		discoverable = true;
 	else
 		discoverable = eir_data.flags & (EIR_LIM_DISC | EIR_GEN_DISC);
-
+#endif
 	ba2str(bdaddr, addr);
 
 #ifdef TIZEN_FEATURE_PLATFROM_SCAN_FILTER
@@ -9852,8 +9856,8 @@ static void update_found_devices(struct btd_adapter *adapter,
 		/*DBG("List BREDR:%p LE:%p Discoverable:%d", adapter->discovery_list,
 			adapter->le_discovery_list, discoverable);*/
 		if ((adapter->discovery_list == NULL &&
-				adapter->le_discovery_list == NULL) || !discoverable) {
-				DBG("discovery list is NULL");
+				adapter->le_discovery_list == NULL)) {
+			DBG("discovery list is NULL");
 			eir_data_free(&eir_data);
 			return;
 		}