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

Commit 38656f86 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Const-ify various btm_ble_" am: 365053f1 

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

Change-Id: Ic51524503a496afbbccd46d0942d09dcd464c35b
parents 29a5fef7 365053f1

system/stack/btm/btm_ble_gap.cc

+7 −7
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ void btm_ble_read_remote_name_cmpl(bool status, const RawAddress& bda, 
  }



  btm_process_remote_name(&bda, bd_name, length + 1, hci_status);

  btm_sec_rmt_name_request_complete(&bda, (uint8_t*)p_name, hci_status);

  btm_sec_rmt_name_request_complete(&bda, (const uint8_t*)p_name, hci_status);

}



/*******************************************************************************
@@ -1797,9 +1797,9 @@ void btm_ble_process_adv_addr(RawAddress& bda, uint8_t* addr_type) { 
 * It updates the inquiry database. If the inquiry database is full, the oldest

 * entry is discarded.

 */

void btm_ble_process_ext_adv_pkt(uint8_t data_len, uint8_t* data) {

void btm_ble_process_ext_adv_pkt(uint8_t data_len, const uint8_t* data) {

  RawAddress bda, direct_address;

  uint8_t* p = data;

  const uint8_t* p = data;

  uint8_t addr_type, num_reports, pkt_data_len, primary_phy, secondary_phy,

      advertising_sid;

  int8_t rssi, tx_power;
@@ -1835,7 +1835,7 @@ void btm_ble_process_ext_adv_pkt(uint8_t data_len, uint8_t* data) { 
    STREAM_TO_BDADDR(direct_address, p);

    STREAM_TO_UINT8(pkt_data_len, p);



    uint8_t* pkt_data = p;

    const uint8_t* pkt_data = p;

    p += pkt_data_len; /* Advance to the the next packet*/

    if (p > data + data_len) {

      LOG(ERROR) << "Invalid pkt_data_len: " << +pkt_data_len;
@@ -1862,9 +1862,9 @@ void btm_ble_process_ext_adv_pkt(uint8_t data_len, uint8_t* data) { 
 * the inquiry database. If the inquiry database is full, the oldest entry is

 * discarded.

 */

void btm_ble_process_adv_pkt(uint8_t data_len, uint8_t* data) {

void btm_ble_process_adv_pkt(uint8_t data_len, const uint8_t* data) {

  RawAddress bda;

  uint8_t* p = data;

  const uint8_t* p = data;

  uint8_t legacy_evt_type, addr_type, num_reports, pkt_data_len;

  int8_t rssi;
@@ -1888,7 +1888,7 @@ void btm_ble_process_adv_pkt(uint8_t data_len, uint8_t* data) { 
    STREAM_TO_BDADDR(bda, p);

    STREAM_TO_UINT8(pkt_data_len, p);



    uint8_t* pkt_data = p;

    const uint8_t* pkt_data = p;

    p += pkt_data_len; /* Advance to the the rssi byte */

    if (p > data + data_len - sizeof(rssi)) {

      LOG(ERROR) << "Invalid pkt_data_len: " << +pkt_data_len;

system/stack/include/ble_hci_link_interface.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
// This header contains functions for HCI-ble to invoke

void btm_ble_conn_complete(uint8_t* p, UNUSED_ATTR uint16_t evt_len,

                           bool enhanced);

void btm_ble_process_adv_pkt(uint8_t len, uint8_t* p);

void btm_ble_process_ext_adv_pkt(uint8_t len, uint8_t* p);

void btm_ble_process_adv_pkt(uint8_t len, const uint8_t* p);

void btm_ble_process_ext_adv_pkt(uint8_t len, const uint8_t* p);

void btm_ble_process_phy_update_pkt(uint8_t len, uint8_t* p);

void btm_ble_read_remote_features_complete(uint8_t* p);

void btm_le_on_advertising_set_terminated(uint8_t* p, uint16_t length);

system/test/mock/mock_stack_btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void btm_ble_init(void) { mock_function_count_map[__func__]++; } 
void btm_ble_process_adv_addr(RawAddress& bda, uint8_t* addr_type) {

  mock_function_count_map[__func__]++;

}

void btm_ble_process_adv_pkt(uint8_t data_len, uint8_t* data) {

void btm_ble_process_adv_pkt(uint8_t data_len, const uint8_t* data) {

  mock_function_count_map[__func__]++;

}

void btm_ble_process_adv_pkt_cont(uint16_t evt_type, uint8_t addr_type,
@@ -166,7 +166,7 @@ void btm_ble_process_adv_pkt_cont_for_inquiry( 
    std::vector<uint8_t> advertising_data) {

  mock_function_count_map[__func__]++;

}

void btm_ble_process_ext_adv_pkt(uint8_t data_len, uint8_t* data) {

void btm_ble_process_ext_adv_pkt(uint8_t data_len, const uint8_t* data) {

  mock_function_count_map[__func__]++;

}

void btm_ble_process_phy_update_pkt(uint8_t len, uint8_t* data) {