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

Commit 25395d74 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use proper types tBT_TRANSPORT"

parents 342f4f06 ec4e0bc1

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_AUTO;

  tBT_TRANSPORT 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/btm_acl.cc

+5 −0
Original line number Diff line number Diff line
@@ -771,6 +771,11 @@ static void maybe_chain_more_commands_after_read_remote_version_complete( 
          internal_.btm_read_remote_features(p_acl_cb->hci_handle);

        }

      }

      break;

    default:

      LOG_ERROR("Unable to determine transport:%s device:%s",

                bt_transport_text(p_acl_cb->transport).c_str(),

                PRIVATE_ADDRESS(p_acl_cb->remote_addr));

  }

}