Merge "Bluetooth 5: Update LE2M implementation through DM (2/3)"

am: 1cde649b04

Change-Id: I60e85a283f12c45566d92a090a6d6a7df78d4fba
This commit is contained in:
Avish Shah 2017-06-15 17:53:44 +00:00 committed by android-build-merger
commit 4f60242707
2 changed files with 4 additions and 4 deletions

View file

@ -276,11 +276,11 @@ typedef struct {
bt_status_t (*conn_parameter_update)(const bt_bdaddr_t *bd_addr, int min_interval,
int max_interval, int latency, int timeout);
bt_status_t (*set_preferred_phy)(int conn_id, uint8_t tx_phy,
bt_status_t (*set_preferred_phy)(const bt_bdaddr_t& bd_addr, uint8_t tx_phy,
uint8_t rx_phy, uint16_t phy_options);
bt_status_t (*read_phy)(
int conn_id,
const bt_bdaddr_t& bd_addr,
base::Callback<void(uint8_t tx_phy, uint8_t rx_phy, uint8_t status)>
cb);

View file

@ -166,11 +166,11 @@ typedef struct {
bt_status_t (*send_response)(int conn_id, int trans_id,
int status, btgatt_response_t *response);
bt_status_t (*set_preferred_phy)(int conn_id, uint8_t tx_phy,
bt_status_t (*set_preferred_phy)(const bt_bdaddr_t& bd_addr, uint8_t tx_phy,
uint8_t rx_phy, uint16_t phy_options);
bt_status_t (*read_phy)(
int conn_id,
const bt_bdaddr_t& bd_addr,
base::Callback<void(uint8_t tx_phy, uint8_t rx_phy, uint8_t status)>
cb);