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

Commit 59856e1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "bta:: Use proper type tBT_TRANSPORT" into main

parents f2d60893 7037e345
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ protected:
            .conn_id = conn_id,
            .client_if = gatt_if,
            .remote_bda = address,
            .transport = GATT_TRANSPORT_LE,
            .transport = BT_TRANSPORT_LE,
            .mtu = 240,
    };

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB* p_clcb) {
   * p_q_cmd. */
  p_clcb->bta_conn_id = 0;
  p_clcb->bda = {};
  p_clcb->transport = 0;
  p_clcb->transport = BT_TRANSPORT_AUTO;
  p_clcb->p_rcb = NULL;
  p_clcb->p_srcb = NULL;
  p_clcb->request_during_discovery = 0;
+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@
#include "mock_csis_client.h"
#include "stack/include/bt_uuid16.h"
#include "test/common/mock_functions.h"
#include "types/bt_transport.h"

bool gatt_profile_get_eatt_support(const RawAddress& addr) { return true; }
void osi_property_set_bool(const char* key, bool value);
@@ -788,7 +789,7 @@ protected:
            .conn_id = conn_id,
            .client_if = gatt_if,
            .remote_bda = address,
            .transport = GATT_TRANSPORT_LE,
            .transport = BT_TRANSPORT_LE,
            .mtu = 240,
    };

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ protected:
            .conn_id = conn_id,
            .client_if = gatt_if,
            .remote_bda = address,
            .transport = GATT_TRANSPORT_LE,
            .transport = BT_TRANSPORT_LE,
            .mtu = 240,
    };

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ protected:
            .conn_id = conn_id,
            .client_if = gatt_if,
            .remote_bda = address,
            .transport = GATT_TRANSPORT_LE,
            .transport = BT_TRANSPORT_LE,
            .mtu = 240,
    };