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

Commit 0076c850 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

stack::btm get_btm_client_interface().sco.BTM_WriteVoiceSettings am: 103be17c 

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



Change-Id: I3b045c422570382350c7cde0aa2799f9b83f210a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14a05dda 103be17c

system/bta/ag/bta_ag_sco.cc

+2 −2
Original line number Diff line number Diff line
@@ -585,9 +585,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) {

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

        get_btm_client_interface().sco.BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

      } 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 Diff line number Diff line
@@ -79,12 +79,7 @@ void BTM_VendorSpecificCommand(uint16_t /* opcode */, uint8_t /* param_len */, 
                               tBTM_VSC_CMPL_CB* /* p_cb */) {

  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_WritePageTimeout(uint16_t /* timeout */) { 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 */,