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

Commit 3de14dbe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Use get_btm_client_interface().eir.BTM_WriteEIR" am: 70051555... 

Merge "legacy: Use get_btm_client_interface().eir.BTM_WriteEIR" am: 70051555 am: 68b20acd am: 16986fdf

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

Change-Id: I4eedfdeca45a54da74e31ced186b389764cc0dfe
parents ed5d5532 16986fdf

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -3100,7 +3100,7 @@ static void bta_dm_set_eir(char* local_name) { 
  if (free_eir_length)

    UINT8_TO_STREAM(p, 0); /* terminator of significant part */



  BTM_WriteEIR(p_buf);

  get_btm_client_interface().eir.BTM_WriteEIR(p_buf);

}



#if (BTA_EIR_CANNED_UUID_LIST != TRUE)

system/main/shim/btm_api.cc

+0 −7
Original line number Diff line number Diff line
@@ -878,13 +878,6 @@ tBTM_STATUS bluetooth::shim::BTM_ClearInqDb(const RawAddress* p_bda) { 
  return BTM_NO_RESOURCES;

}



tBTM_STATUS bluetooth::shim::BTM_WriteEIR(BT_HDR* p_buff) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  CHECK(p_buff != nullptr);

  osi_free(p_buff);

  return BTM_NO_RESOURCES;

}



bool bluetooth::shim::BTM_HasEirService(const uint32_t* p_eir_uuid,

                                        uint16_t uuid16) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

system/main/shim/btm_api.h

+0 −15
Original line number Diff line number Diff line
@@ -287,21 +287,6 @@ tBTM_INQ_INFO* BTM_InqDbNext(tBTM_INQ_INFO* p_cur); 
 ******************************************************************************/

tBTM_STATUS BTM_ClearInqDb(const RawAddress* p_bda);



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

 *

 * Function         BTM_WriteEIR

 *

 * Description      This function is called to write EIR data to controller.

 *

 * Parameters       p_buff - allocated HCI command buffer including extended

 *                           inquriry response

 *

 * Returns          BTM_SUCCESS  - if successful

 *                  BTM_MODE_UNSUPPORTED - if local device cannot support it

 *

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

tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff);



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

 *

 * Function         BTM_HasEirService

system/test/mock/mock_main_shim_btm_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -217,10 +217,6 @@ tBTM_STATUS bluetooth::shim::BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  mock_function_count_map[__func__]++;

  return BTM_SUCCESS;

}

tBTM_STATUS bluetooth::shim::BTM_WriteEIR(BT_HDR* p_buff) {

  mock_function_count_map[__func__]++;

  return BTM_SUCCESS;

}

tBTM_STATUS bluetooth::shim::btm_sec_mx_access_request(

    const RawAddress& bd_addr, bool is_originator,

    uint16_t security_requirement, tBTM_SEC_CALLBACK* p_callback,

system/test/mock/mock_stack_btm.cc

+3 −0
Original line number Diff line number Diff line
@@ -30,10 +30,13 @@ void BTM_BleBackgroundObserve(bool enable, tBTM_INQ_RESULTS_CB* p_results_cb) {} 
void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) {}

uint8_t BTM_GetAcceptlistSize() { return 0; }



tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff) { return BTM_SUCCESS; }



struct btm_client_interface_t btm_client_interface = {

    .eir =

        {

            .BTM_GetEirSupportedServices = BTM_GetEirSupportedServices,

            .BTM_WriteEIR = BTM_WriteEIR,

        },

};