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

Commit 5f194148 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "legacy: Use proper types tBTA_DM_SEC_EVT" am: 05a055e9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1948943

Change-Id: I5011fce1c97578fe0d3302594c6a91edfcdb1b65
parents 19f6129d 05a055e9

system/bta/dm/bta_dm_act.cc

+4 −5
Original line number Diff line number Diff line
@@ -2061,11 +2061,10 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr, 
                                         uint8_t key_type) {

  tBTA_DM_SEC sec_event;

  tBTA_DM_AUTH_CMPL* p_auth_cmpl;

  uint8_t event;

  tBTA_DM_SEC_EVT event = BTA_DM_AUTH_CMPL_EVT;



  memset(&sec_event, 0, sizeof(tBTA_DM_SEC));



  event = BTA_DM_AUTH_CMPL_EVT;

  p_auth_cmpl = &sec_event.auth_cmpl;



  p_auth_cmpl->bd_addr = bd_addr;
@@ -3632,7 +3631,7 @@ static void bta_dm_ble_id_key_cback(uint8_t key_type, 
        };

        memcpy(&dm_key.ble_id_keys, p_key, sizeof(tBTM_BLE_LOCAL_KEYS));



        uint8_t evt = (key_type == BTM_BLE_KEY_TYPE_ID)

        tBTA_DM_SEC_EVT evt = (key_type == BTM_BLE_KEY_TYPE_ID)

                                  ? BTA_DM_BLE_LOCAL_IR_EVT

                                  : BTA_DM_BLE_LOCAL_ER_EVT;

        bta_dm_cb.p_sec_cback(evt, &dm_key);