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

Commit 90a235e5 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Hui Peng
Browse files

Add const in key missing related callback 

Bug: 297598060
Bug: 311447399
Test: m com.android.btservices
Flags: exception, trivial change
Change-Id: Ied7f2d45d3acbdc29cebb6818684a2c2900869a2
parent 827610f0

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ static void le_rand_callback(uint64_t /* random */) { 
  // Android doesn't support the LeRand API.

}



static void key_missing_callback(RawAddress bd_addr) {

static void key_missing_callback(const RawAddress bd_addr) {

  std::shared_lock<std::shared_timed_mutex> lock(jniObjMutex);

  if (!sJniCallbacksObj) {

    ALOGE("%s, JNI obj is null. Failed to call JNI callback", __func__);

system/bta/dm/bta_dm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void bta_dm_sec_enable(tBTA_DM_SEC_CBACK* p_sec_cback) { 
  btm_local_io_caps = btif_storage_get_local_io_caps();

}



void bta_dm_remote_key_missing(RawAddress bd_addr) {

void bta_dm_remote_key_missing(const RawAddress bd_addr) {

  if (bta_dm_sec_cb.p_sec_cback) {

    tBTA_DM_SEC sec_event;

    sec_event.key_missing.bd_addr = bd_addr;

system/include/hardware/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ typedef void (*energy_info_callback)(bt_activity_energy_info* energy_info, 
typedef void (*generate_local_oob_data_callback)(tBT_TRANSPORT transport,

                                                 bt_oob_data_t oob_data);



typedef void (*key_missing_callback)(RawAddress bd_addr);

typedef void (*key_missing_callback)(const RawAddress bd_addr);



/** TODO: Add callbacks for Link Up/Down and other generic

 *  notifications/callbacks */

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void btm_inq_stop_on_ssp(void); 
bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                              const RawAddress& new_pseudo_addr);

void bta_dm_remove_device(const RawAddress& bd_addr);

void bta_dm_remote_key_missing(RawAddress bd_addr);

void bta_dm_remote_key_missing(const RawAddress bd_addr);

void bta_dm_process_remove_device(const RawAddress& bd_addr);

void btm_inq_clear_ssp(void);

system/test/mock/mock_bluetooth_interface.cc

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void invoke_link_quality_report_cb(uint64_t timestamp, int report_id, int rssi, 
                                   int snr, int retransmission_count,

                                   int packets_not_receive_count,

                                   int negative_acknowledgement_count) {}

void invoke_key_missing_cb(RawAddress bd_addr) {}

void invoke_key_missing_cb(const RawAddress bd_addr) {}



static void init_stack(bluetooth::core::CoreInterface* interface) {}