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

Commit 1c5eec48 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

[25/25] stack::l2cap encapsulate l2c_api.h am: 79624607 

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



Change-Id: I59924e47975c9c01b91468e041df54a4bec5112c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f10a465e 79624607

system/bta/av/bta_av_aact.cc

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_status.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cap_interface.h"

#include "storage/config_keys.h"

#include "types/hci_role.h"
@@ -2592,16 +2591,17 @@ void bta_av_rcfg_str_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  if (com::android::bluetooth::flags::fix_avdt_rconfig_not_setting_l2cap()) {

    /* Set the media channel as high priority */

    if (!L2CA_SetTxPriority(p_scb->l2c_cid, L2CAP_CHNL_PRIORITY_HIGH)) {

    if (!stack::l2cap::get_interface().L2CA_SetTxPriority(p_scb->l2c_cid,

                                                          L2CAP_CHNL_PRIORITY_HIGH)) {

      log::warn("Unable to set L2CAP Tx priority peer:{} cid:{}", p_scb->PeerAddress(),

                p_scb->l2c_cid);

    }



    if (!L2CA_SetChnlFlushability(p_scb->l2c_cid, true)) {

    if (!stack::l2cap::get_interface().L2CA_SetChnlFlushability(p_scb->l2c_cid, true)) {

      log::warn("Unable to set L2CAP flush peer:{} cid:{}", p_scb->PeerAddress(), p_scb->l2c_cid);

    }



    L2CA_SetMediaStreamChannel(p_scb->l2c_cid, true);

    stack::l2cap::get_interface().L2CA_SetMediaStreamChannel(p_scb->l2c_cid, true);

  }



  /* rc listen */

system/bta/include/bta_jv_api.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "include/macros.h"

#include "internal_include/bt_target.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cap_interface.h"

#include "stack/include/rfcdefs.h"

#include "types/bluetooth/uuid.h"

system/stack/avct/avct_api.cc

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include "avct_int.h"

#include "bta/include/bta_sec_api.h"

#include "internal_include/bt_target.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "osi/include/allocator.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2cap_interface.h"

system/stack/avct/avct_int.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include "avct_api.h"

#include "internal_include/bt_target.h"

#include "l2c_api.h"

#include "osi/include/fixed_queue.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2cap_interface.h"

system/stack/avct/avct_l2c.cc

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include "avct_int.h"

#include "btif/include/btif_av.h"

#include "internal_include/bt_target.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "osi/include/allocator.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2cap_interface.h"