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

Commit 820cb55a authored by Chris Manton's avatar Chris Manton
Browse files

Replace BT_TRANSPORT_INVALID => BT_TRANSPORT_AUTO 

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

Change-Id: I8c50f37485697f8056b9c685f63571a945df4302
parent 863c1b64

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
      BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE) ||

      BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_BR_EDR);



  uint8_t other_transport = BT_TRANSPORT_INVALID;

  uint8_t other_transport = BT_TRANSPORT_AUTO;

  if (is_bd_addr_connected) {

    APPL_TRACE_DEBUG("%s: ACL Up count: %d", __func__,

                     bta_dm_cb.device_list.count);

system/stack/acl/acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void tACL_CONN::Reset() { 
  conn_addr = RawAddress::kEmpty;

  remote_addr = RawAddress::kEmpty;

  link_up_issued = false;

  transport = BT_TRANSPORT_INVALID;

  transport = BT_TRANSPORT_AUTO;

  flush_timeout_in_ticks = 0;

  hci_handle = 0;

  link_super_tout = 0;

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -876,9 +876,9 @@ tBTM_STATUS BTM_SecBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
                                        device_type);

  }



  if (transport == BT_TRANSPORT_INVALID)

  if (transport == BT_TRANSPORT_AUTO) {

    transport = BTM_UseLeLink(bd_addr) ? BT_TRANSPORT_LE : BT_TRANSPORT_BR_EDR;



  }

  tBT_DEVICE_TYPE dev_type;



  BTM_ReadDevInfo(bd_addr, &dev_type, &addr_type);

system/types/bt_transport.h

+2 −3
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 


#include <string>



#define BT_TRANSPORT_INVALID 0

#define BT_TRANSPORT_UNKNOWN BT_TRANSPORT_INVALID

#define BT_TRANSPORT_AUTO BT_TRANSPORT_INVALID

#define BT_TRANSPORT_AUTO 0

#define BT_TRANSPORT_UNKNOWN BT_TRANSPORT_AUTO



#define BT_TRANSPORT_BR_EDR 1

#define BT_TRANSPORT_LE 2