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

Commit 614a0151 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use get_btm_client_interface().lifecycle.BTM_GetHCIConnHandle am: 721605d2 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1541451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6155c363b7757a9474faded11b2e4cc37da662bb
parents 346b3828 721605d2

system/bta/av/bta_av_aact.cc

+3 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "stack/include/acl_api.h"

#include "stack/include/btm_client_interface.h"

#include "utl.h"



/*****************************************************************************
@@ -3170,7 +3171,8 @@ static void bta_av_offload_codec_builder(tBTA_AV_SCB* p_scb, 
  p_a2dp_offload->max_latency = 0;

  p_a2dp_offload->mtu = mtu;

  p_a2dp_offload->acl_hdl =

      BTM_GetHCIConnHandle(p_scb->PeerAddress(), BT_TRANSPORT_BR_EDR);

      get_btm_client_interface().lifecycle.BTM_GetHCIConnHandle(

          p_scb->PeerAddress(), BT_TRANSPORT_BR_EDR);

  btav_a2dp_scmst_info_t scmst_info =

      p_scb->p_cos->get_scmst_info(p_scb->PeerAddress());

  p_a2dp_offload->scms_t_enable[0] = scmst_info.enable_status;

system/bta/sys/bta_sys_main.cc

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#include "osi/include/fixed_queue.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/acl_client_callbacks.h"

#include "stack/include/btm_client_interface.h"

#include "utl.h"



void BTIF_dm_on_hw_error();

system/stack/btm/btm_main.cc

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "btm_int.h"

#include "main/shim/dumpsys.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/btm_client_interface.h"

#include "stack_config.h"



/* Global BTM control block structure