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

Commit bee3615c authored by Chris Manton's avatar Chris Manton
Browse files

Inclusive language BTM_DEV_BLACKLISTED => BTM_DEV_RESTRICT_LISTED 

Bug: 170342881
Tag: #refactor
Test: atest --host bluetooth_test_gd

Change-Id: I64f5be7d2aa38a62091fde43b1926479021c10a6
parent 5fdbebd7

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { 
            "%s: peer %s BTM_SwitchRoleToCentral(HCI_ROLE_CENTRAL) error: %d",

            __func__, p_scb->PeerAddress().ToString().c_str(), status);

      }

      if (status != BTM_MODE_UNSUPPORTED && status != BTM_DEV_BLACKLISTED) {

      if (status != BTM_MODE_UNSUPPORTED && status != BTM_DEV_RESTRICT_LISTED) {

        is_ok = false;

        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;

      }

system/main/shim/btm.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ using BtmStatus = enum : uint16_t { 
  BTM_REPEATED_ATTEMPTS = 19,   /* repeated attempts for LE security requests */

  BTM_MODE4_LEVEL4_NOT_SUPPORTED = 20, /* Secure Connections Only Mode can't be

                                     supported */

  BTM_DEV_BLACKLISTED = 21,            /* The device is Blacklisted */

  BTM_DEV_RESTRICT_LISTED = 21,        /* The device is restrict listed */

};



class Btm {

system/stack/acl/btm_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,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_BLACKLISTED;

    return BTM_DEV_RESTRICT_LISTED;

  }



  if (BTM_IsScoActiveByBdaddr(remote_bd_addr)) {

system/stack/include/btm_status.h

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ enum : uint8_t { 
  BTM_REPEATED_ATTEMPTS,   /* 19 repeated attempts for LE security requests */

  BTM_MODE4_LEVEL4_NOT_SUPPORTED, /* 20 Secure Connections Only Mode can't be

                                     supported */

  BTM_DEV_BLACKLISTED             /* 21 The device is Blacklisted */

  BTM_DEV_RESTRICT_LISTED         /* 21 The device is restrict listed */

};

typedef uint8_t tBTM_STATUS;
@@ -91,8 +91,8 @@ inline std::string btm_status_text(tBTM_STATUS status) { 
      return std::string("repeated_attempts");

    case BTM_MODE4_LEVEL4_NOT_SUPPORTED:

      return std::string("level4_security_unsupported");

    case BTM_DEV_BLACKLISTED:

      return std::string("reject_listed");

    case BTM_DEV_RESTRICT_LISTED:

      return std::string("restrict_listed");

    default:

      return base::StringPrintf("UNKNOWN[%u]", status);

  }