Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81fb3d8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Const-ify btm_ble_gap" am: c62638b2 am: 360ce520 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1913033

Change-Id: Ieab3b1cdafcece40b3aeab4a1821c1816f204446
parents 8b21838a 360ce520

system/main/shim/btm.cc

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ extern void btm_ble_process_adv_pkt_cont( 
    uint16_t event_type, uint8_t address_type, const RawAddress& raw_address,

    uint8_t primary_phy, uint8_t secondary_phy, uint8_t advertising_sid,

    int8_t tx_power, int8_t rssi, uint16_t periodic_adv_int, uint8_t data_len,

    uint8_t* data);

    const uint8_t* data);



extern void btm_api_process_inquiry_result(const RawAddress& raw_address,

                                           uint8_t page_scan_rep_mode,

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ void btm_ble_process_adv_pkt_cont(uint16_t evt_type, uint8_t addr_type, 
                                  uint8_t secondary_phy,

                                  uint8_t advertising_sid, int8_t tx_power,

                                  int8_t rssi, uint16_t periodic_adv_int,

                                  uint8_t data_len, uint8_t* data);

                                  uint8_t data_len, const uint8_t* data);

static uint8_t btm_set_conn_mode_adv_init_addr(RawAddress& p_peer_addr_ptr,

                                               tBLE_ADDR_TYPE* p_peer_addr_type,

                                               tBLE_ADDR_TYPE* p_own_addr_type);
@@ -1946,7 +1946,7 @@ void btm_ble_process_adv_pkt_cont(uint16_t evt_type, uint8_t addr_type, 
                                  uint8_t secondary_phy,

                                  uint8_t advertising_sid, int8_t tx_power,

                                  int8_t rssi, uint16_t periodic_adv_int,

                                  uint8_t data_len, uint8_t* data) {

                                  uint8_t data_len, const uint8_t* data) {

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;

  bool update = true;

system/test/mock/mock_stack_btm_ble_gap.cc

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void btm_ble_process_adv_pkt_cont(uint16_t evt_type, uint8_t addr_type, 
                                  uint8_t secondary_phy,

                                  uint8_t advertising_sid, int8_t tx_power,

                                  int8_t rssi, uint16_t periodic_adv_int,

                                  uint8_t data_len, uint8_t* data) {

                                  uint8_t data_len, const uint8_t* data) {

  mock_function_count_map[__func__]++;

}

void btm_ble_process_adv_pkt_cont_for_inquiry(