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

Commit 1396fcc9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert^2 "stack::btm get_btm_client_interface().sco.BTM_WriteVoiceSettings"" into main

parents e3c50c00 c3d274be

system/bta/ag/bta_ag_sco.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -546,9 +546,9 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
                bluetooth::hci::OpCode::ENHANCED_SETUP_SYNCHRONOUS_CONNECTION))) {

                bluetooth::hci::OpCode::ENHANCED_SETUP_SYNCHRONOUS_CONNECTION))) {

      if (esco_codec == tBTA_AG_UUID_CODEC::UUID_CODEC_MSBC ||

      if (esco_codec == tBTA_AG_UUID_CODEC::UUID_CODEC_MSBC ||

          esco_codec == tBTA_AG_UUID_CODEC::UUID_CODEC_LC3) {

          esco_codec == tBTA_AG_UUID_CODEC::UUID_CODEC_LC3) {

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

        get_btm_client_interface().sco.BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

      } else {

      } else {

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_CVSD);

        get_btm_client_interface().sco.BTM_WriteVoiceSettings(BTM_VOICE_SETTING_CVSD);

      }

      }

    }

    }

system/test/mock/mock_stack_btm_devctl.cc

+1 −6
Original line number Original line Diff line number Diff line
@@ -76,12 +76,7 @@ void BTM_VendorSpecificCommand(uint16_t /* opcode */, uint8_t /* param_len */, 
                               uint8_t* /* p_param_buf */, tBTM_VSC_CMPL_CB* /* p_cb */) {

                               uint8_t* /* p_param_buf */, tBTM_VSC_CMPL_CB* /* p_cb */) {

  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

}

}

void BTM_WritePageTimeout(uint16_t /* timeout */) {

void BTM_WritePageTimeout(uint16_t /* timeout */) { inc_func_call_count(__func__); }

  inc_func_call_count(__func__);

}

void BTM_WriteVoiceSettings(uint16_t /* settings */) {

  inc_func_call_count(__func__);

}

void BTM_db_reset(void) { inc_func_call_count(__func__); }

void BTM_db_reset(void) { inc_func_call_count(__func__); }

void BTM_reset_complete() { inc_func_call_count(__func__); }

void BTM_reset_complete() { inc_func_call_count(__func__); }

void btm_delete_stored_link_key_complete(uint8_t* /* p */, uint16_t /* evt_len */) {

void btm_delete_stored_link_key_complete(uint8_t* /* p */, uint16_t /* evt_len */) {