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

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

Merge "[Invisalign2] move the following fields to SecurityClientInterface" into main

parents e6dd48ee ed142a2a

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -250,11 +250,11 @@ void BTA_dm_on_hw_on() { 
  btif_dm_get_ble_local_keys(&key_mask, &er, &id_key);



  if (key_mask & BTA_BLE_LOCAL_KEY_TYPE_ER) {

    get_btm_client_interface().ble.BTM_BleLoadLocalKeys(

    get_btm_client_interface().security.BTM_BleLoadLocalKeys(

        BTA_BLE_LOCAL_KEY_TYPE_ER, (tBTM_BLE_LOCAL_KEYS*)&er);

  }

  if (key_mask & BTA_BLE_LOCAL_KEY_TYPE_ID) {

    get_btm_client_interface().ble.BTM_BleLoadLocalKeys(

    get_btm_client_interface().security.BTM_BleLoadLocalKeys(

        BTA_BLE_LOCAL_KEY_TYPE_ID, (tBTM_BLE_LOCAL_KEYS*)&id_key);

  }

system/bta/dm/bta_dm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ void bta_dm_add_ble_device(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
 ******************************************************************************/

void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept,

                              uint32_t passkey) {

  get_btm_client_interface().ble.BTM_BlePasskeyReply(

  get_btm_client_interface().security.BTM_BlePasskeyReply(

      bd_addr, accept ? BTM_SUCCESS : BTM_NOT_AUTHORIZED, passkey);

}

system/stack/btm/btm_client_interface.cc

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

            .BTM_BleObserve = BTM_BleObserve,

            .BTM_SetBleDataLength = BTM_SetBleDataLength,

            .BTM_BleLoadLocalKeys = BTM_BleLoadLocalKeys,

            .BTM_BlePasskeyReply = BTM_BlePasskeyReply,

            .BTM_BleReadControllerFeatures = BTM_BleReadControllerFeatures,

            .BTM_BleSetPhy = BTM_BleSetPhy,

            .BTM_BleSetPrefConnParams = BTM_BleSetPrefConnParams,

system/stack/btm/btm_security_client_interface.cc

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ static SecurityClientInterface security = { 
    .BTM_Sec_Free = BTM_Sec_Free,

    .BTM_SecRegister = BTM_SecRegister,



    .BTM_BleLoadLocalKeys = BTM_BleLoadLocalKeys,



    .BTM_SecAddDevice = BTM_SecAddDevice,

    .BTM_SecAddBleDevice = BTM_SecAddBleDevice,

    .BTM_SecDeleteDevice = BTM_SecDeleteDevice,
@@ -57,11 +59,11 @@ static SecurityClientInterface security = { 


    .BTM_SecBond = BTM_SecBond,

    .BTM_SecBondCancel = BTM_SecBondCancel,



    .BTM_RemoteOobDataReply = BTM_RemoteOobDataReply,

    .BTM_PINCodeReply = BTM_PINCodeReply,

    .BTM_SecConfirmReqReply = BTM_SecConfirmReqReply,

    .BTM_BleSirkConfirmDeviceReply = BTM_BleSirkConfirmDeviceReply,

    .BTM_BlePasskeyReply = BTM_BlePasskeyReply,



    .BTM_GetSecurityMode = BTM_GetSecurityMode,

system/stack/include/btm_client_interface.h

+0 −3
Original line number Diff line number Diff line
@@ -99,9 +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_BleLoadLocalKeys)(uint8_t key_type, tBTM_BLE_LOCAL_KEYS* p_key);

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

                                uint32_t passkey);

    void (*BTM_BleReadControllerFeatures)(

        tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback);

    void (*BTM_BleSetConnScanParams)(uint32_t scan_interval,