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

Commit 0c8e7451 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] Unify BTM_BleConfirmReply and BTM_ConfirmReqReply" into main

parents 681c8c31 67d59c6b

system/bta/dm/bta_dm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -1069,8 +1069,8 @@ void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept, 
/** This is response to SM numeric comparison request submitted to application.

 */

void bta_dm_ble_confirm_reply(const RawAddress& bd_addr, bool accept) {

  get_btm_client_interface().ble.BTM_BleConfirmReply(

      bd_addr, accept ? BTM_SUCCESS : BTM_NOT_AUTHORIZED);

  get_btm_client_interface().security.BTM_SecConfirmReqReply(

      accept ? BTM_SUCCESS : BTM_NOT_AUTHORIZED, BT_TRANSPORT_LE, bd_addr);

}



/** This function set the local device LE privacy settings. */

system/stack/btm/btm_client_interface.cc

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct btm_client_interface_t btm_client_interface = { 
            .BTM_BleGetEnergyInfo = BTM_BleGetEnergyInfo,

            .BTM_BleObserve = BTM_BleObserve,

            .BTM_SetBleDataLength = BTM_SetBleDataLength,

            .BTM_BleConfirmReply = BTM_BleConfirmReply,

            .BTM_BleLoadLocalKeys = BTM_BleLoadLocalKeys,

            .BTM_BlePasskeyReply = BTM_BlePasskeyReply,

            .BTM_BleReadControllerFeatures = BTM_BleReadControllerFeatures,

system/stack/btm/btm_security_client_interface.cc

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ static void BTM_SecConfirmReqReply(tBTM_STATUS res, tBT_TRANSPORT transport, 
                                   const RawAddress bd_addr) {

  if (transport == BT_TRANSPORT_BR_EDR) {

    BTM_ConfirmReqReply(res, bd_addr);

  } else if (transport == BT_TRANSPORT_LE) {

    BTM_BleConfirmReply(bd_addr, res);

  } else {

    LOG_ERROR("Unexpected transport:%d", transport);

  }

system/stack/include/btm_client_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct btm_client_interface_t { 
                                  bool low_latency_scan);

    tBTM_STATUS (*BTM_SetBleDataLength)(const RawAddress& bd_addr,

                                        uint16_t tx_pdu_length);

    void (*BTM_BleConfirmReply)(const RawAddress& bd_addr, uint8_t res);

    void (*BTM_BleLoadLocalKeys)(uint8_t key_type, tBTM_BLE_LOCAL_KEYS* p_key);

    void (*BTM_BlePasskeyReply)(const RawAddress& bd_addr, uint8_t res,

                                uint32_t passkey);

system/test/mock/mock_stack_btm_interface.cc

+0 −2
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ struct btm_client_interface_t default_btm_client_interface = { 
        .BTM_SetBleDataLength = [](const RawAddress& /* bd_addr */,

                                   uint16_t /* tx_pdu_length */)

            -> tBTM_STATUS { return BTM_SUCCESS; },

        .BTM_BleConfirmReply = [](const RawAddress& /* bd_addr */,

                                  uint8_t /* res */) {},

        .BTM_BleLoadLocalKeys = [](uint8_t /* key_type */,

                                   tBTM_BLE_LOCAL_KEYS* /* p_key */) {},

        .BTM_BlePasskeyReply = [](const RawAddress& /* bd_addr */,