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

Commit 38f16b63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib70fc1f7,I8c50f374 

* changes:
  Replace BT_TRANSPORT_UNKNOWN => BT_TRANSPORT_AUTO
  Replace BT_TRANSPORT_INVALID => BT_TRANSPORT_AUTO
parents 04bb3822 29e7029a

system/bta/dm/bta_dm_act.cc

+4 −4
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);
@@ -1624,7 +1624,7 @@ static void bta_dm_discover_next_device(void) { 
 ******************************************************************************/

static void bta_dm_discover_device(const RawAddress& remote_bd_addr) {

  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;

  if (bta_dm_search_cb.transport == BT_TRANSPORT_UNKNOWN) {

  if (bta_dm_search_cb.transport == BT_TRANSPORT_AUTO) {

    tBT_DEVICE_TYPE dev_type;

    tBLE_ADDR_TYPE addr_type;
@@ -1667,7 +1667,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
                                       transport)) {

      if (bta_dm_search_cb.state != BTA_DM_DISCOVER_ACTIVE) {

        /* Reset transport state for next discovery */

        bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;

        bta_dm_search_cb.transport = BT_TRANSPORT_AUTO;

      }

      return;

    }
@@ -1677,7 +1677,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
  }



  /* Reset transport state for next discovery */

  bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;

  bta_dm_search_cb.transport = BT_TRANSPORT_AUTO;



  /* if application wants to discover service */

  if (bta_dm_search_cb.services) {

system/btif/src/bluetooth.cc

+2 −3
Original line number Diff line number Diff line
@@ -284,9 +284,8 @@ int set_remote_device_property(RawAddress* remote_addr, 
int get_remote_services(RawAddress* remote_addr) {

  if (!interface_ready()) return BT_STATUS_NOT_READY;



  do_in_main_thread(FROM_HERE,

                    base::BindOnce(btif_dm_get_remote_services, *remote_addr,

                                   BT_TRANSPORT_UNKNOWN));

  do_in_main_thread(FROM_HERE, base::BindOnce(btif_dm_get_remote_services,

                                              *remote_addr, BT_TRANSPORT_AUTO));

  return BT_STATUS_SUCCESS;

}

system/btif/src/btif_dm.cc

+4 −4
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
        }

        bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED);



        btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_UNKNOWN);

        btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);

      }

    }

    // Do not call bond_state_changed_cb yet. Wait until remote service
@@ -1036,7 +1036,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
          BTIF_TRACE_WARNING("%s() - Pairing timeout; retrying (%d) ...",

                             __func__, pairing_cb.timeout_retries);

          --pairing_cb.timeout_retries;

          btif_dm_cb_create_bond(bd_addr, BT_TRANSPORT_UNKNOWN);

          btif_dm_cb_create_bond(bd_addr, BT_TRANSPORT_AUTO);

          return;

        }

        FALLTHROUGH_INTENDED; /* FALLTHROUGH */
@@ -1075,7 +1075,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
          /* Create the Bond once again */

          BTIF_TRACE_WARNING("%s() auto pair failed. Reinitiate Bond",

                             __func__);

          btif_dm_cb_create_bond(bd_addr, BT_TRANSPORT_UNKNOWN);

          btif_dm_cb_create_bond(bd_addr, BT_TRANSPORT_AUTO);

          return;

        } else {

          /* if autopair attempts are more than 1, or not attempted */
@@ -1301,7 +1301,7 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
        if (pairing_cb.sdp_attempts) {

          LOG_WARN("SDP failed after bonding re-attempting");

          pairing_cb.sdp_attempts++;

          btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_UNKNOWN);

          btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);

        } else {

          LOG_WARN("SDP triggered by someone failed when bonding");

        }

system/main/shim/btm.cc

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ size_t Btm::GetNumberOfAdvertisingInstances() const { 


tBTM_STATUS Btm::CreateBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                            tBT_TRANSPORT transport, int device_type) {

  if (transport == BT_TRANSPORT_UNKNOWN) {

  if (transport == BT_TRANSPORT_AUTO) {

    if (device_type & BT_DEVICE_TYPE_BLE) {

      transport = BT_TRANSPORT_LE;

    } else if (device_type & BT_DEVICE_TYPE_BREDR) {

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;