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

Commit 29fc797d authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

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

Merge "Merge "legacy: Restore missed check for interop role switch" am: bffc41c9 am: bbe68e0e am: 789ce809 am: 07dd24f4 am: 71313d23" into tm-dev am: 8885ca48

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



Change-Id: Id3f54be84e8dc1d0b1e1c5f018307021849e6119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01915321 8885ca48

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(