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

Commit 2853df98 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Use get_btm_client_interface().eir.BTM_RemoveEirService am: b5a1b324... 

legacy: Use get_btm_client_interface().eir.BTM_RemoveEirService am: b5a1b324 am: 384b1443 am: a5f90e79 am: 069fbbc0

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

Change-Id: I8ee8f9deefb8ce521a17f68116680d2217b1ccfc
parents 9f7c911e 069fbbc0

system/bta/dm/bta_dm_act.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -3200,7 +3200,8 @@ void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding) { 
  } else {

  } else {

    LOG_INFO("EIR Removing UUID=0x%04X from extended inquiry response", uuid16);

    LOG_INFO("EIR Removing UUID=0x%04X from extended inquiry response", uuid16);





    BTM_RemoveEirService(bta_dm_cb.eir_uuid, uuid16);

    get_btm_client_interface().eir.BTM_RemoveEirService(bta_dm_cb.eir_uuid,

                                                        uuid16);

  }

  }





  bta_dm_set_eir(NULL);

  bta_dm_set_eir(NULL);

system/main/shim/btm_api.cc

+0 −6
Original line number Original line Diff line number Diff line
@@ -898,12 +898,6 @@ void bluetooth::shim::BTM_AddEirService(uint32_t* p_eir_uuid, uint16_t uuid16) { 
  CHECK(p_eir_uuid != nullptr);

  CHECK(p_eir_uuid != nullptr);

}

}





void bluetooth::shim::BTM_RemoveEirService(uint32_t* p_eir_uuid,

                                           uint16_t uuid16) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  CHECK(p_eir_uuid != nullptr);

}



void bluetooth::shim::BTM_SecAddBleDevice(const RawAddress& bd_addr,

void bluetooth::shim::BTM_SecAddBleDevice(const RawAddress& bd_addr,

                                          tBT_DEVICE_TYPE dev_type,

                                          tBT_DEVICE_TYPE dev_type,

                                          tBLE_ADDR_TYPE addr_type) {

                                          tBLE_ADDR_TYPE addr_type) {

system/main/shim/btm_api.h

+0 −15
Original line number Original line Diff line number Diff line
@@ -334,21 +334,6 @@ tBTM_EIR_SEARCH_RESULT BTM_HasInquiryEirService(tBTM_INQ_RESULTS* p_results, 
 ******************************************************************************/

 ******************************************************************************/

void BTM_AddEirService(uint32_t* p_eir_uuid, uint16_t uuid16);

void BTM_AddEirService(uint32_t* p_eir_uuid, uint16_t uuid16);





/*******************************************************************************

 *

 * Function         BTM_RemoveEirService

 *

 * Description      This function is called to remove a service from the bit map

 *                  UUID list.

 *

 * Parameters       p_eir_uuid - bit mask of UUID list for EIR

 *                  uuid16 - UUID 16-bit

 *

 * Returns          None

 *

 ******************************************************************************/

void BTM_RemoveEirService(uint32_t* p_eir_uuid, uint16_t uuid16);



/*******************************************************************************

/*******************************************************************************

 *

 *

 * Function         BTM_SecAddBleDevice

 * Function         BTM_SecAddBleDevice

system/test/mock/mock_main_shim_btm_api.cc

+0 −4
Original line number Original line Diff line number Diff line
@@ -383,10 +383,6 @@ void bluetooth::shim::BTM_RemoteOobDataReply(tBTM_STATUS res, 
                                             const Octet16& r) {

                                             const Octet16& r) {

  mock_function_count_map[__func__]++;

  mock_function_count_map[__func__]++;

}

}

void bluetooth::shim::BTM_RemoveEirService(uint32_t* p_eir_uuid,

                                           uint16_t uuid16) {

  mock_function_count_map[__func__]++;

}

void bluetooth::shim::BTM_SecAddBleDevice(const RawAddress& bd_addr,

void bluetooth::shim::BTM_SecAddBleDevice(const RawAddress& bd_addr,

                                          tBT_DEVICE_TYPE dev_type,

                                          tBT_DEVICE_TYPE dev_type,

                                          tBLE_ADDR_TYPE addr_type) {

                                          tBLE_ADDR_TYPE addr_type) {

system/test/mock/mock_stack_btm_inq.cc

+0 −3
Original line number Original line Diff line number Diff line
@@ -144,9 +144,6 @@ void BTM_AddEirService(uint32_t* p_eir_uuid, uint16_t uuid16) { 
void BTM_CancelInquiry(void) { mock_function_count_map[__func__]++; }

void BTM_CancelInquiry(void) { mock_function_count_map[__func__]++; }

void BTM_EnableInterlacedInquiryScan() { mock_function_count_map[__func__]++; }

void BTM_EnableInterlacedInquiryScan() { mock_function_count_map[__func__]++; }

void BTM_EnableInterlacedPageScan() { mock_function_count_map[__func__]++; }

void BTM_EnableInterlacedPageScan() { mock_function_count_map[__func__]++; }

void BTM_RemoveEirService(uint32_t* p_eir_uuid, uint16_t uuid16) {

  mock_function_count_map[__func__]++;

}

void btm_clr_inq_db(const RawAddress* p_bda) {

void btm_clr_inq_db(const RawAddress* p_bda) {

  mock_function_count_map[__func__]++;

  mock_function_count_map[__func__]++;

}

}