Merge "LE: Add limited advertising duration capability (1/3)" into lmp-dev

diff --combined include/hardware/bt_gatt_client.h
index 2f72d3a,295f5c8..8073dd1
--- 1/include/hardware/bt_gatt_client.h
--- 2/include/hardware/bt_gatt_client.h
+++ b/include/hardware/bt_gatt_client.h
@@@ -170,6 -170,10 +170,6 @@@ typedef void (*scan_filter_param_callba
  /** Callback invoked when a scan filter configuration command has completed */
  typedef void (*scan_filter_status_callback)(int enable, int client_if, int status);
  
 -/** Track ADV VSE callback invoked when tracked device is found or lost */
 -typedef void (*track_adv_event_callback)(int client_if, int filt_index, int addr_type,
 -                                             bt_bdaddr_t* bda, int adv_state);
 -
  /** Callback invoked when multi-adv enable operation has completed */
  typedef void (*multi_adv_enable_callback)(int client_if, int status);
  
@@@ -201,9 -205,6 +201,9 @@@ typedef void (*batchscan_reports_callba
  /** Callback invoked when batchscan storage threshold limit is crossed */
  typedef void (*batchscan_threshold_callback)(int client_if);
  
 +/** Track ADV VSE callback invoked when tracked device is found or lost */
 +typedef void (*track_adv_event_callback)(int client_if, int filt_index, int addr_type,
 +                                             bt_bdaddr_t* bda, int adv_state);
  
  typedef struct {
      register_client_callback            register_client_cb;
@@@ -378,17 -379,17 +378,17 @@@ typedef struct 
  
      /* Setup the parameters as per spec, user manual specified values and enable multi ADV */
      bt_status_t (*multi_adv_enable)(int client_if, int min_interval,int max_interval,int adv_type,
-                  int chnl_map, int tx_power);
+                  int chnl_map, int tx_power, int timeout_s);
  
      /* Update the parameters as per spec, user manual specified values and restart multi ADV */
      bt_status_t (*multi_adv_update)(int client_if, int min_interval,int max_interval,int adv_type,
-                  int chnl_map, int tx_power);
+                  int chnl_map, int tx_power, int timeout_s);
  
      /* Setup the data for the specified instance */
      bt_status_t (*multi_adv_set_inst_data)(int client_if, bool set_scan_rsp, bool include_name,
-                     bool incl_txpower, int appearance, uint16_t manufacturer_len,
-                     char* manufacturer_data, uint16_t service_data_len,
-                     char* service_data, uint16_t service_uuid_len, char* service_uuid);
+                     bool incl_txpower, int appearance, int manufacturer_len,
+                     char* manufacturer_data, int service_data_len,
+                     char* service_data, int service_uuid_len, char* service_uuid);
  
      /* Disable the multi adv instance */
      bt_status_t (*multi_adv_disable)(int client_if);