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

Commit 29211591 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

BTA_DM_LINK_UP_EVT doesn't care about link type am: 9f68d949 am: 1bcbec93 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1393960

Change-Id: Icb13b13cc65088a9c5d23404a7da766412e3621a
parents 9b0e77f5 1bcbec93

system/bta/dm/bta_dm_act.cc

+3 −2
Original line number Diff line number Diff line
@@ -2728,7 +2728,6 @@ static void bta_dm_acl_change(bool is_new, const RawAddress& bd_addr, 
    device->pref_role = BTA_ANY_ROLE;

    conn.link_up.bd_addr = bd_addr;

    device->info = BTA_DM_DI_NONE;

    conn.link_up.link_type = transport;

    device->transport = transport;



    const controller_t* controller = controller_get_interface();
@@ -2741,7 +2740,9 @@ static void bta_dm_acl_change(bool is_new, const RawAddress& bd_addr, 
    }

    APPL_TRACE_WARNING("%s info: 0x%x", __func__, device->info);



    if (bta_dm_cb.p_sec_cback) bta_dm_cb.p_sec_cback(BTA_DM_LINK_UP_EVT, &conn);

    if (bta_dm_cb.p_sec_cback) {

      bta_dm_cb.p_sec_cback(BTA_DM_LINK_UP_EVT, &conn);

    }

  } else {

    for (uint8_t i = 0; i < bta_dm_cb.device_list.count; i++) {

      auto device = &bta_dm_cb.device_list.peer_device[i];

system/bta/include/bta_api.h

+0 −1
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ typedef struct { 
/* Structure associated with BTA_DM_LINK_UP_EVT */

typedef struct {

  RawAddress bd_addr; /* BD address peer device. */

  tBTA_TRANSPORT link_type;

} tBTA_DM_LINK_UP;



/* Structure associated with BTA_DM_LINK_DOWN_EVT */