iBeacon: Modify ibeacon scan filter API parameters

Change-Id: I91aff1e6261d8f0c7a7f50632424320f69844019
Signed-off-by: h.sandeep <h.sandeep@samsung.com>

diff --git a/include/mobile/bluetooth_internal.h b/include/mobile/bluetooth_internal.h
index 892d33f482c9882149ffbf4f083aea986dcb8fc4..563c98aee48ae16a0120331ebda91131dedfcd76 100644 (file)
--- a/include/mobile/bluetooth_internal.h
+++ b/include/mobile/bluetooth_internal.h
@@ -3193,8 +3193,7 @@ int bt_proximity_get_supported_services(const char *remote_address, int *support
  * @internal
  * @brief API to set scan filter for iBeacons reports
  */
-int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter,
-                       const char *data, unsigned int data_len);
+int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter);
 
 /**
  * @internal

diff --git a/include/tv/bluetooth_internal.h b/include/tv/bluetooth_internal.h
index 892d33f482c9882149ffbf4f083aea986dcb8fc4..563c98aee48ae16a0120331ebda91131dedfcd76 100644 (file)
--- a/include/tv/bluetooth_internal.h
+++ b/include/tv/bluetooth_internal.h
@@ -3193,8 +3193,7 @@ int bt_proximity_get_supported_services(const char *remote_address, int *support
  * @internal
  * @brief API to set scan filter for iBeacons reports
  */
-int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter,
-                       const char *data, unsigned int data_len);
+int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter);
 
 /**
  * @internal

diff --git a/include/wearable/bluetooth_internal.h b/include/wearable/bluetooth_internal.h
index 6950b89c0f25b41d1c71040e6c250c32bfe203ca..a447146f1ff1345f4a2262e6a3bfe5fc6cd87222 100644 (file)
--- a/include/wearable/bluetooth_internal.h
+++ b/include/wearable/bluetooth_internal.h
@@ -3341,8 +3341,7 @@ int bt_proximity_get_supported_services(const char *remote_address, int *support
  * @internal
  * @brief API to set scan filter for iBeacons reports
  */
-int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter,
-                       const char *data, unsigned int data_len);
+int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter);
 
 /**
  * @internal

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index c25eba06c038f463e42ef0ae1925e811839fdfcd..b1315088b2ed6009d140003f811d6a4f0731c77b 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -3876,9 +3876,7 @@ int bt_adapter_unset_authentication_req_cb(void)
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter,
-                       const char *data,
-                       unsigned int data_len)
+int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter)
 {
        bt_le_scan_filter_s *__filter = (bt_le_scan_filter_s *)scan_filter;
        int ibeacon_manufacturer_id = COMPANY_ID_APPLE;
@@ -3889,23 +3887,12 @@ int bt_adapter_le_scan_filter_set_ibeacon(bt_scan_filter_h scan_filter,
 
        BT_INFO("");
 
-       if (data_len > 27) {
-               BT_ERR("INVALID_PARAMETER(0x%08x)",
-                       BT_ERROR_INVALID_PARAMETER); /* LCOV_EXCL_LINE */
-               bt_adapter_le_destroy_scan_filter(scan_filter);
-               return BT_ERROR_INVALID_PARAMETER;
-       }
        g_free(__filter->manufacturer_data);
        g_free(__filter->manufacturer_data_mask);
 
        __filter->manufacturer_id = ibeacon_manufacturer_id;
-       if (data != NULL) {
-               __filter->manufacturer_data = g_memdup(data, data_len);
-               __filter->manufacturer_data_len = data_len;
-       } else {
-               __filter->manufacturer_data = NULL;
-               __filter->manufacturer_data_len = 0;
-       }
+       __filter->manufacturer_data = NULL;
+       __filter->manufacturer_data_len = 0;
        __filter->manufacturer_data_mask = NULL;
 
        return BT_ERROR_NONE;

diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index 3b4fa528d2bfc976b771395fcad9d93b62244916..b11dff90cdd08070608b71d277a87bdc4484c60e 100644 (file)
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -5461,13 +5461,12 @@ int test_input_callback(void *data)
 
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_IBEACON_DATA: {
                        bt_scan_filter_h scan_filter;
-                       char manufacture_1[] = {0x02, 0x15, 0xD9, 0xB9, 0xEC, 0x1F, 0x39, 0x25, 0x43, 0xD0, 0x80, 0xA9, 0x1E, 0x39, 0xD4, 0xCE, 0xA9, 0x5C, 0x01, 0x00, 0x0A, 0x00, 0x10};
 
                        ret = bt_adapter_le_create_scan_filter(&scan_filter);
                        if (ret != BT_ERROR_NONE)
                           TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_scan_filter_set_ibeacon(scan_filter, manufacture_1, sizeof(manufacture_1));
+                       ret = bt_adapter_le_scan_filter_set_ibeacon(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);