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

Commit 7e2faab6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Chris Manton
Browse files

Merge "legacy: Restore missed check for interop role switch" am: bffc41c9... 

Merge "legacy: Restore missed check for interop role switch" am: bffc41c9 am: bbe68e0e am: 789ce809 am: 07dd24f4 am: 71313d23

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



Bug: 229924391
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Iab3333b2a43b629755c9d3dd530301c98d612e7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit 0eda62f2)
parent db8261f1

system/stack/acl/btm_acl.cc

+5 −0
Original line number Diff line number Diff line
@@ -577,6 +577,11 @@ tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) { 
    return BTM_BUSY;

  }



  if (interop_match_addr(INTEROP_DYNAMIC_ROLE_SWITCH, &remote_bd_addr)) {

    LOG_DEBUG("Device restrict listed under INTEROP_DYNAMIC_ROLE_SWITCH");

    return BTM_DEV_RESTRICT_LISTED;

  }



  tBTM_PM_MODE pwr_mode;

  if (!BTM_ReadPowerMode(p_acl->remote_addr, &pwr_mode)) {

    LOG_WARN(