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

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

btif:: Use proper type tBT_TRANSPORT 

Bug: 354214926
Test: m .
Flag: EXEMPT, Proper data typing

Change-Id: I1542ecc91867545071082e249b15506a0143f866
parent 5312ce77

system/btif/include/btif_api.h

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ bool btif_dm_pairing_is_busy(); 
 * Description      Initiate bonding with the specified device

 *

 ******************************************************************************/

void btif_dm_create_bond(const RawAddress bd_addr, int transport);

void btif_dm_create_bond(const RawAddress bd_addr, tBT_TRANSPORT transport);



/*******************************************************************************

 *
@@ -345,7 +345,7 @@ bt_status_t btif_dm_get_adapter_property(bt_property_t* prop); 
 * Returns          bt_status_t

 *

 ******************************************************************************/

void btif_dm_get_remote_services(const RawAddress remote_addr, int transport);

void btif_dm_get_remote_services(const RawAddress remote_addr, tBT_TRANSPORT transport);



/*******************************************************************************

 *

system/btif/src/btif_dm.cc

+2 −2
Original line number Diff line number Diff line
@@ -2365,7 +2365,7 @@ bool btif_dm_pairing_is_busy() { return pairing_cb.state != BT_BOND_STATE_NONE; 
 * Description      Initiate bonding with the specified device

 *

 ******************************************************************************/

void btif_dm_create_bond(const RawAddress bd_addr, int transport) {

void btif_dm_create_bond(const RawAddress bd_addr, tBT_TRANSPORT transport) {

  log::verbose("bd_addr={}, transport={}", bd_addr, transport);



  BTM_LogHistory(kBtmLogTag, bd_addr, "Create bond",
@@ -2823,7 +2823,7 @@ static void btif_on_name_read_legacy(RawAddress bd_addr, tHCI_ERROR_CODE hci_sta 
 * Returns          bt_status_t

 *

 ******************************************************************************/

void btif_dm_get_remote_services(RawAddress remote_addr, const int transport) {

void btif_dm_get_remote_services(RawAddress remote_addr, const tBT_TRANSPORT transport) {

  log::verbose("transport={}, remote_addr={}", bt_transport_text(transport), remote_addr);



  BTM_LogHistory(kBtmLogTag, remote_addr, "Service discovery",

system/btif/test/btif_core_test.cc

+10 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "btif/include/btif_util.h"

#include "btif_bqr.h"

#include "btif_jni_task.h"

#include "btm_api_types.h"

#include "common/bind.h"

#include "common/contextual_callback.h"

#include "common/postable_context.h"
@@ -44,7 +43,6 @@ 
#include "hci/hci_layer_mock.h"

#include "include/hardware/bluetooth.h"

#include "include/hardware/bt_av.h"

#include "main/shim/entry.h"

#include "main_thread.h"

#include "packet/base_packet_builder.h"

#include "packet/bit_inserter.h"
@@ -661,6 +659,8 @@ TEST_F(BtifCoreWithConnectionTest, btif_dm_get_connection_state__connected_no_en 
  test::mock::stack_btm_sec::BTM_IsEncrypted.body = [](const RawAddress& /* bd_addr */,

                                                       tBT_TRANSPORT transport) {

    switch (transport) {

      case BT_TRANSPORT_AUTO:

        return false;

      case BT_TRANSPORT_BR_EDR:

        return false;

      case BT_TRANSPORT_LE:
@@ -676,6 +676,8 @@ TEST_F(BtifCoreWithConnectionTest, btif_dm_get_connection_state__connected_class 
  test::mock::stack_btm_sec::BTM_IsEncrypted.body = [](const RawAddress& /* bd_addr */,

                                                       tBT_TRANSPORT transport) {

    switch (transport) {

      case BT_TRANSPORT_AUTO:

        return false;

      case BT_TRANSPORT_BR_EDR:

        return true;

      case BT_TRANSPORT_LE:
@@ -692,6 +694,8 @@ TEST_F(BtifCoreWithConnectionTest, btif_dm_get_connection_state__connected_le_en 
  test::mock::stack_btm_sec::BTM_IsEncrypted.body = [](const RawAddress& /* bd_addr */,

                                                       tBT_TRANSPORT transport) {

    switch (transport) {

      case BT_TRANSPORT_AUTO:

        return false;

      case BT_TRANSPORT_BR_EDR:

        return false;

      case BT_TRANSPORT_LE:
@@ -707,6 +711,8 @@ TEST_F(BtifCoreWithConnectionTest, btif_dm_get_connection_state__connected_both_ 
  test::mock::stack_btm_sec::BTM_IsEncrypted.body = [](const RawAddress& /* bd_addr */,

                                                       tBT_TRANSPORT transport) {

    switch (transport) {

      case BT_TRANSPORT_AUTO:

        return false;

      case BT_TRANSPORT_BR_EDR:

        return true;

      case BT_TRANSPORT_LE:
@@ -722,6 +728,8 @@ TEST_F(BtifCoreWithConnectionTest, btif_dm_get_connection_state_sync) { 
  test::mock::stack_btm_sec::BTM_IsEncrypted.body = [](const RawAddress& /* bd_addr */,

                                                       tBT_TRANSPORT transport) {

    switch (transport) {

      case BT_TRANSPORT_AUTO:

        return false;

      case BT_TRANSPORT_BR_EDR:

        return true;

      case BT_TRANSPORT_LE: