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

Commit 49e2b894 authored by Chris Manton's avatar Chris Manton
Browse files

[9/24] Canonical form tBTM_STATUS::BTM_DEV_RESTRICT_LISTED

Prepare for class enum-ify tBTM_STATUS

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I6207de7d31120434fb4b0c55e8c634932a174c94
parent c6ae2a90
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) {
      case tBTM_STATUS::BTM_CMD_STARTED:
        break;
      case BTM_MODE_UNSUPPORTED:
      case BTM_DEV_RESTRICT_LISTED:
      case tBTM_STATUS::BTM_DEV_RESTRICT_LISTED:
        // Role switch can never happen, but indicate to caller
        // a result such that a timer will not start to repeatedly
        // try something not possible.
+2 −2
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) {

  if (interop_match_addr(INTEROP_DISABLE_ROLE_SWITCH, &remote_bd_addr)) {
    log::info("Remote device is on list preventing role switch");
    return BTM_DEV_RESTRICT_LISTED;
    return tBTM_STATUS::BTM_DEV_RESTRICT_LISTED;
  }

  if (get_btm_client_interface().sco.BTM_IsScoActiveByBdaddr(remote_bd_addr)) {
@@ -570,7 +570,7 @@ tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) {

  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;
    return tBTM_STATUS::BTM_DEV_RESTRICT_LISTED;
  }

  tBTM_PM_MODE pwr_mode;