BLE scan filter setup simplification (1/3)
Bug: 30622771
Test: sl4a BleScanTest
Change-Id: I41f53e2275c0d5da5244c72faefc7b330bd1a8f9
diff --git a/include/hardware/ble_scanner.h b/include/hardware/ble_scanner.h
index f2a9370..62b6399 100644
--- a/include/hardware/ble_scanner.h
+++ b/include/hardware/ble_scanner.h
@@ -92,8 +92,9 @@
virtual void Scan(bool start) = 0;
/** Setup scan filter params */
- virtual bt_status_t scan_filter_param_setup(
- btgatt_filt_param_setup_t filt_param) = 0;
+ virtual void ScanFilterParamSetup(uint8_t client_if, uint8_t action,
+ uint8_t filt_index,
+ std::unique_ptr<btgatt_filt_param_setup_t> filt_param) = 0;
/** Configure a scan filter condition */
virtual bt_status_t scan_filter_add_remove(
diff --git a/include/hardware/bt_common_types.h b/include/hardware/bt_common_types.h
index 1e6be6b..cff3072 100644
--- a/include/hardware/bt_common_types.h
+++ b/include/hardware/bt_common_types.h
@@ -73,4 +73,19 @@
uint16_t permissions;
} btgatt_db_element_t;
+typedef struct
+{
+ uint16_t feat_seln;
+ uint16_t list_logic_type;
+ uint8_t filt_logic_type;
+ uint8_t rssi_high_thres;
+ uint8_t rssi_low_thres;
+ uint8_t dely_mode;
+ uint16_t found_timeout;
+ uint16_t lost_timeout;
+ uint8_t found_timeout_cnt;
+ uint16_t num_of_tracking_entries;
+} btgatt_filt_param_setup_t;
+
+
#endif /* ANDROID_INCLUDE_BT_COMMON_TYPES_H */
diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h
index 4322852..76b52fd 100644
--- a/include/hardware/bt_gatt_client.h
+++ b/include/hardware/bt_gatt_client.h
@@ -68,23 +68,6 @@
typedef struct
{
- uint8_t client_if;
- uint8_t action;
- uint8_t filt_index;
- uint16_t feat_seln;
- uint16_t list_logic_type;
- uint8_t filt_logic_type;
- uint8_t rssi_high_thres;
- uint8_t rssi_low_thres;
- uint8_t dely_mode;
- uint16_t found_timeout;
- uint16_t lost_timeout;
- uint8_t found_timeout_cnt;
- uint16_t num_of_tracking_entries;
-} btgatt_filt_param_setup_t;
-
-typedef struct
-{
bt_bdaddr_t *bda1;
bt_uuid_t *uuid1;
uint16_t u1;