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

Commit 6d4fcdca authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[19/19] get_btm_client_interface().sco.BTM_WriteVoiceSettings" into... 

Merge "[19/19] get_btm_client_interface().sco.BTM_WriteVoiceSettings" into main am: 7a8e25ee am: 8a1171fb

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



Change-Id: I82ac43a551a1bd159c36083537397f1a6ac1db3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f0425d9 8a1171fb

system/bta/ag/bta_ag_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "osi/include/alarm.h"

#include "osi/include/compat.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"

#include "types/raw_address.h"



using namespace bluetooth;
@@ -420,7 +420,7 @@ void bta_ag_api_enable(tBTA_AG_CBACK* p_cback) { 
  bta_ag_cb.p_cback = p_cback;



  /* call init call-out */

  BTM_WriteVoiceSettings(AG_VOICE_SETTINGS);

  get_btm_client_interface().sco.BTM_WriteVoiceSettings(AG_VOICE_SETTINGS);



  bta_sys_collision_register(BTA_ID_AG, bta_ag_collision_cback);

system/bta/ag/bta_ag_sco.cc

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 
      /* Bypass vendor specific and voice settings if enhanced eSCO supported */

      if (!(bluetooth::shim::GetController()->IsSupported(

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

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_CVSD);

        get_btm_client_interface().sco.BTM_WriteVoiceSettings(

            BTM_VOICE_SETTING_CVSD);

      }



      /* If SCO open was initiated by AG and failed for mSBC T2, try mSBC T1

system/bta/hf_client/bta_hf_client_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "internal_include/bt_target.h"

#include "osi/include/allocator.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/sdp_api.h"

#include "types/raw_address.h"
@@ -440,7 +440,7 @@ tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback, 
  bta_hf_client_create_record(&bta_hf_client_cb_arr, p_service_name);



  /* set same setting as AG does */

  BTM_WriteVoiceSettings(AG_VOICE_SETTINGS);

  get_btm_client_interface().sco.BTM_WriteVoiceSettings(AG_VOICE_SETTINGS);



  bta_sys_collision_register(BTA_ID_HS, bta_hf_client_collision_cback);