Merge "Change how Advertise Data is passed to BTIF (1/3)" am: 81f7d7e8bf
am: 7da5970d15

Change-Id: If661f21a43a0142ffa9c67d115c1f6c71e6799d4
diff --git a/include/hardware/ble_advertiser.h b/include/hardware/ble_advertiser.h
index acd9169..10bf8dd 100644
--- a/include/hardware/ble_advertiser.h
+++ b/include/hardware/ble_advertiser.h
@@ -40,11 +40,7 @@
   virtual void Unregister(uint8_t advertiser_id) = 0;
 
   /** Set the advertising data or scan response data */
-  virtual void SetData(int advertiser_id, bool set_scan_rsp, bool include_name,
-                       bool include_txpower, int min_interval, int max_interval,
-                       int appearance, vector<uint8_t> manufacturer_data,
-                       vector<uint8_t> service_data,
-                       vector<uint8_t> service_uuid) = 0;
+  virtual void SetData(bool set_scan_rsp, vector<uint8_t> data) = 0;
 
   /* Set the parameters as per spec, user manual specified values */
   virtual void MultiAdvSetParameters(int advertiser_id, int min_interval,
@@ -54,11 +50,7 @@
 
   /* Setup the data for the specified instance */
   virtual void MultiAdvSetInstData(int advertiser_id, bool set_scan_rsp,
-                                   bool include_name, bool incl_txpower,
-                                   int appearance,
-                                   vector<uint8_t> manufacturer_data,
-                                   vector<uint8_t> service_data,
-                                   vector<uint8_t> service_uuid,
+                                   vector<uint8_t> data,
                                    BleAdvertiserCb cb) = 0;
 
   /* Enable the advertising instance as per spec */