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

Commit 6f3e80dd authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Const-ify bta_dm_pin_cback am: 8e3dbd16 

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

Change-Id: I9da612947a9b6efdaf8e31f83f84075368352aa1
parents fa7746ff 8e3dbd16

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void bta_dm_find_services(const RawAddress& bd_addr); 
static void bta_dm_discover_next_device(void);

static void bta_dm_sdp_callback(tSDP_STATUS sdp_status);

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                BD_NAME bd_name, bool min_16_digit);

                                const BD_NAME bd_name, bool min_16_digit);

static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

                                         DEV_CLASS dev_class, BD_NAME bd_name,

                                         const LinkKey& key, uint8_t key_type);
@@ -2028,7 +2028,7 @@ static void bta_dm_pinname_cback(void* p_data) { 
 *

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

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                BD_NAME bd_name, bool min_16_digit) {

                                const BD_NAME bd_name, bool min_16_digit) {

  if (!bta_dm_cb.p_sec_cback) return BTM_NOT_AUTHORIZED;



  /* If the device name is not known, save bdaddr and devclass and initiate a

system/stack/include/security_client_callbacks.h

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ typedef uint8_t(tBTM_AUTHORIZE_CALLBACK)(uint8_t service_id); 
 *              Flag indicating the minimum pin code length to be 16 digits

 */

typedef uint8_t(tBTM_PIN_CALLBACK)(const RawAddress& bd_addr,

                                   DEV_CLASS dev_class, tBTM_BD_NAME bd_name,

                                   DEV_CLASS dev_class,

                                   const tBTM_BD_NAME bd_name,

                                   bool min_16_digit);



/* New Link Key for the connection.  Parameters are