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

Commit d77b136a authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Remove usage of base::Owned in BTM_SetEncryption" into main am: 5b55f263 

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



Change-Id: I1e1cf260eadb393ce022aaa049ca795d824bb7c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba8a213a 5b55f263

system/bta/dm/bta_dm_sec.cc

+4 −4
Original line number Diff line number Diff line
@@ -794,17 +794,17 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 
 * Returns         None

 *

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

void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport,

void bta_dm_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport,

                          void* /* p_ref_data */, tBTM_STATUS result) {

  tBTA_DM_ENCRYPT_CBACK* p_callback = nullptr;

  tBTA_DM_PEER_DEVICE* device = find_connected_device(*bd_addr, transport);

  tBTA_DM_PEER_DEVICE* device = find_connected_device(bd_addr, transport);

  if (device != nullptr) {

    p_callback = device->p_encrypt_cback;

    device->p_encrypt_cback = nullptr;

  }



  log::debug("Encrypted:{:c}, peer:{} transport:{} status:{} callback:{:c}",

             result == BTM_SUCCESS ? 'T' : 'F', *bd_addr,

             result == BTM_SUCCESS ? 'T' : 'F', bd_addr,

             bt_transport_text(transport), btm_status_text(result),

             (p_callback) ? 'T' : 'F');
@@ -827,7 +827,7 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, 
  }



  if (p_callback) {

    (*p_callback)(*bd_addr, transport, bta_status);

    (*p_callback)(bd_addr, transport, bta_status);

  }

}

system/bta/hearing_aid/hearing_aid.cc

+3 −4
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ Uuid LE_PSM_UUID = Uuid::FromString("2d410339-82b6-42aa-b34e-e2e01 


static void read_rssi_callback(void* p_void);

static void hearingaid_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data);

static void encryption_callback(const RawAddress*, tBT_TRANSPORT, void*,

                                tBTM_STATUS);

static void encryption_callback(RawAddress, tBT_TRANSPORT, void*, tBTM_STATUS);



inline BT_HDR* malloc_l2cap_buf(uint16_t len) {

  BT_HDR* msg = (BT_HDR*)osi_malloc(BT_HDR_SIZE + L2CAP_MIN_OFFSET +
@@ -2156,10 +2155,10 @@ static void hearingaid_gattc_callback(tBTA_GATTC_EVT event, 
  }

}



static void encryption_callback(const RawAddress* address, tBT_TRANSPORT, void*,

static void encryption_callback(RawAddress address, tBT_TRANSPORT, void*,

                                tBTM_STATUS status) {

  if (instance) {

    instance->OnEncryptionComplete(*address,

    instance->OnEncryptionComplete(address,

                                   status == BTM_SUCCESS ? true : false);

  }

}

system/bta/hh/bta_hh_le.cc

+2 −3
Original line number Diff line number Diff line
@@ -971,12 +971,11 @@ static void bta_hh_le_pri_service_discovery(tBTA_HH_DEV_CB* p_cb) { 
 * Returns          None

 *

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

static void bta_hh_le_encrypt_cback(const RawAddress* bd_addr,

                                    tBT_TRANSPORT transport,

static void bta_hh_le_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport,

                                    void* /* p_ref_data */,

                                    tBTM_STATUS result) {

  tAclLinkSpec link_spec;

  link_spec.addrt.bda = *bd_addr;

  link_spec.addrt.bda = bd_addr;

  link_spec.addrt.type = BLE_ADDR_PUBLIC;

  link_spec.transport = transport;

system/bta/test/bta_dm_test.cc

+7 −7
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ TEST_F(BtaDmTest, bta_dm_set_encryption) { 
  BTA_DM_ENCRYPT_CBACK_queue = {};

}



void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport,

void bta_dm_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport,

                          void* /* p_ref_data */, tBTM_STATUS result);



TEST_F(BtaDmTest, bta_dm_encrypt_cback) {
@@ -277,20 +277,20 @@ TEST_F(BtaDmTest, bta_dm_encrypt_cback) { 


  // Encryption with no callback set

  device->p_encrypt_cback = nullptr;

  bta_dm_encrypt_cback(&kRawAddress, transport, nullptr, BTM_SUCCESS);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_SUCCESS);

  ASSERT_EQ(0UL, BTA_DM_ENCRYPT_CBACK_queue.size());



  // Encryption with callback

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(&kRawAddress, transport, nullptr, BTM_SUCCESS);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_SUCCESS);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(&kRawAddress, transport, nullptr, BTM_WRONG_MODE);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_WRONG_MODE);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(&kRawAddress, transport, nullptr, BTM_NO_RESOURCES);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_NO_RESOURCES);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(&kRawAddress, transport, nullptr, BTM_BUSY);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_BUSY);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(&kRawAddress, transport, nullptr, BTM_ILLEGAL_VALUE);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_ILLEGAL_VALUE);



  ASSERT_EQ(5UL, BTA_DM_ENCRYPT_CBACK_queue.size());

system/bta/vc/vc_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ class VolumeControlTest : public ::testing::Test { 
                             tBTM_SEC_CALLBACK* p_callback, void* p_ref_data,

                             tBTM_BLE_SEC_ACT sec_act) -> tBTM_STATUS {

              if (p_callback) {

                p_callback(&bd_addr, transport, p_ref_data,

                p_callback(bd_addr, transport, p_ref_data,

                           success ? BTM_SUCCESS : BTM_FAILED_ON_SECURITY);

              }

              GetEncryptionCompleteEvt(bd_addr);