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

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

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

Merge "[18/19] get_btm_client_interface().sco.BTM_IsScoActiveByBdaddr" into main am: fc3aa16b am: 0087a6a1

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



Change-Id: I4e53ea46857c27a0e968232ce4f26fa7b308f9f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84e511c9 0087a6a1

system/stack/acl/btm_acl.cc

+2 −3
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include "main/shim/dumpsys.h"

#include "main/shim/entry.h"

#include "main/shim/helpers.h"

#include "os/log.h"

#include "os/parameter_provider.h"

#include "osi/include/allocator.h"

#include "osi/include/properties.h"
@@ -69,8 +68,8 @@ 
#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_iso_api.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hcimsgs.h"
@@ -578,7 +577,7 @@ tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) { 
    return BTM_DEV_RESTRICT_LISTED;

  }



  if (BTM_IsScoActiveByBdaddr(remote_bd_addr)) {

  if (get_btm_client_interface().sco.BTM_IsScoActiveByBdaddr(remote_bd_addr)) {

    log::info("An active SCO to device prevents role switch at this time");

    return BTM_NO_RESOURCES;

  }