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

Commit 54d894be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Const-ify BTM_SecAddDevice" am: 461b72c7 am: b0508628 am:... 

Merge "legacy: Const-ify BTM_SecAddDevice" am: 461b72c7 am: b0508628 am: d4aec988 am: 15d9b231

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

Change-Id: Id68463e2b33ce29160feb0b85b78b257a1348d71
parents 611f8f83 15d9b231

system/main/shim/btm_api.cc

+2 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,8 @@ tBTM_STATUS bluetooth::shim::BTM_SecBondCancel(const RawAddress& bd_addr) { 
}



bool bluetooth::shim::BTM_SecAddDevice(const RawAddress& bd_addr,

                                       DEV_CLASS dev_class, BD_NAME bd_name,

                                       DEV_CLASS dev_class,

                                       const BD_NAME& bd_name,

                                       uint8_t* features, LinkKey* link_key,

                                       uint8_t key_type, uint8_t pin_length) {

  // Check if GD has a security record for the device

system/main/shim/btm_api.h

+2 −2
Original line number Diff line number Diff line
@@ -1403,8 +1403,8 @@ uint8_t BTM_SecClrService(uint8_t service_id); 
 *

 ******************************************************************************/

bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,

                      BD_NAME bd_name, uint8_t* features, LinkKey* link_key,

                      uint8_t key_type, uint8_t pin_length);

                      const BD_NAME& bd_name, uint8_t* features,

                      LinkKey* link_key, uint8_t key_type, uint8_t pin_length);



/** Free resources associated with the device associated with |bd_addr| address.

 *

system/stack/btm/btm_dev.cc

+3 −2
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ extern tBTM_CB btm_cb; 
 *

 ******************************************************************************/

bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,

                      BD_NAME bd_name, uint8_t* features, LinkKey* p_link_key,

                      uint8_t key_type, uint8_t pin_length) {

                      const BD_NAME& bd_name, uint8_t* features,

                      LinkKey* p_link_key, uint8_t key_type,

                      uint8_t pin_length) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  if (!p_dev_rec) {

    p_dev_rec = btm_sec_allocate_dev_rec();

system/stack/btm/btm_dev.h

+0 −21
Original line number Diff line number Diff line
@@ -21,27 +21,6 @@ 
#include "stack/include/bt_octets.h"

#include "types/raw_address.h"



/*******************************************************************************

 *

 * Function         BTM_SecAddDevice

 *

 * Description      Add/modify device.  This function will be normally called

 *                  during host startup to restore all required information

 *                  stored in the NVRAM.

 *

 * Parameters:      bd_addr          - BD address of the peer

 *                  dev_class        - Device Class

 *                  bd_name          - Name of the peer device. NULL if unknown.

 *                  features         - Remote device's features (up to 3 pages).

 *                                     NULL if not known

 *                  link_key         - Connection link key. NULL if unknown.

 *

 * Returns          true if added OK, else false

 *

 ******************************************************************************/

bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,

                      BD_NAME bd_name, uint8_t* features, LinkKey* p_link_key,

                      uint8_t key_type, uint8_t pin_length);

void wipe_secrets_and_remove(tBTM_SEC_DEV_REC* p_dev_rec);



/** Free resources associated with the device associated with |bd_addr| address.

system/stack/btm/security_device_record.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ struct tBTM_SEC_DEV_REC { 


 private:

  friend bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,

                               BD_NAME bd_name, uint8_t* features,

                               const BD_NAME& bd_name, uint8_t* features,

                               LinkKey* p_link_key, uint8_t key_type,

                               uint8_t pin_length);

  friend void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res,