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

Commit 8b2a619f authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Revert "stack::btm get_btm_client_interface().sco.BTM_WriteVoiceSettings" am:... 

Revert "stack::btm get_btm_client_interface().sco.BTM_WriteVoiceSettings" am: d96a2f56 am: 1f0298bd

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



Change-Id: I56740d7f039643d3bdb3c39d158bf64a52d202ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 737627ab 1f0298bd

system/bta/ag/bta_ag_sco.cc

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

      if (esco_codec == tBTA_AG_UUID_CODEC::UUID_CODEC_MSBC ||

          esco_codec == tBTA_AG_UUID_CODEC::UUID_CODEC_LC3) {

        get_btm_client_interface().sco.BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

      } else {

        get_btm_client_interface().sco.BTM_WriteVoiceSettings(BTM_VOICE_SETTING_CVSD);

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_CVSD);

      }

    }

system/test/mock/mock_stack_btm_devctl.cc

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

  inc_func_call_count(__func__);

}

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

void BTM_WritePageTimeout(uint16_t /* timeout */) {

  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_reset_complete() { inc_func_call_count(__func__); }

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