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

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

Merge "[16/19] get_btm_client_interface().sco.BTM_GetNumScoLinks" into main am: 72fce1e5 

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



Change-Id: Ib8f27b304c334b8b00ffcdaf2c9b2039a1d817f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e7b979d 72fce1e5

system/bta/sys/bta_sys_conn.cc

+3 −6
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ 


#include "bta/sys/bta_sys.h"

#include "bta/sys/bta_sys_int.h"

#include "internal_include/bt_target.h"

#include "main/shim/dumpsys.h"

#include "os/log.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"

#include "types/hci_role.h"

#include "types/raw_address.h"
@@ -305,7 +302,7 @@ void bta_sys_sco_close(tBTA_SYS_ID id, uint8_t app_id, 
  uint8_t num_sco_links;



  if ((id != BTA_ID_AG) && (bta_sys_cb.p_sco_cb)) {

    num_sco_links = BTM_GetNumScoLinks();

    num_sco_links = get_btm_client_interface().sco.BTM_GetNumScoLinks();

    bta_sys_cb.p_sco_cb(BTA_SYS_SCO_CLOSE, num_sco_links, app_id, peer_addr);

  }
@@ -346,7 +343,7 @@ void bta_sys_sco_use(tBTA_SYS_ID /* id */, uint8_t app_id, 
void bta_sys_sco_unuse(tBTA_SYS_ID /* id */, uint8_t app_id,

                       const RawAddress& peer_addr) {

  if ((bta_sys_cb.p_sco_cb)) {

    uint8_t num_sco_links = BTM_GetNumScoLinks();

    uint8_t num_sco_links = get_btm_client_interface().sco.BTM_GetNumScoLinks();

    bta_sys_cb.p_sco_cb(BTA_SYS_SCO_CLOSE, num_sco_links, app_id, peer_addr);

  }

}

system/stack/l2cap/l2c_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -1586,7 +1586,7 @@ uint16_t L2CA_FlushChannel(uint16_t lcid, uint16_t num_to_flush) { 
      /* If the controller supports enhanced flush, flush the data queued at the

       * controller */

      if (bluetooth::shim::GetController()->SupportsNonFlushablePb() &&

          (BTM_GetNumScoLinks() == 0)) {

          (get_btm_client_interface().sco.BTM_GetNumScoLinks() == 0)) {

        /* The only packet type defined - 0 - Automatically-Flushable Only */

        l2c_acl_flush(p_lcb->Handle());

      }