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

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

Use properly typed RNR callback tBTM_CMPL_CB => tBTM_NAME_CMPL_CB am: 54ad5468 

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



Change-Id: I686f27846e35331bb115bf2e102f06a6b38175cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1498f9a2 54ad5468

system/bta/dm/bta_dm_act.cc

+6 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void bta_dm_inq_cmpl_cb(void* p_result); 
static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                DEV_CLASS dc,

                                                tBTM_BD_NAME bd_name);

static void bta_dm_remname_cback(void* p);

static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p);

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);
@@ -2145,7 +2145,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 
 * Returns          void

 *

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

static void bta_dm_remname_cback(void* p) {

static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p) {

  tBTM_REMOTE_DEV_NAME* p_remote_name = (tBTM_REMOTE_DEV_NAME*)p;

  APPL_TRACE_DEBUG("bta_dm_remname_cback len = %d name=<%s>",

                   p_remote_name->length, p_remote_name->remote_bd_name);
@@ -2210,7 +2210,7 @@ static void bta_dm_remname_cback(void* p) { 
 * Returns          void

 *

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

static void bta_dm_pinname_cback(void* p_data) {

static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) {

  tBTM_REMOTE_DEV_NAME* p_result = (tBTM_REMOTE_DEV_NAME*)p_data;

  tBTA_DM_SEC sec_event;

  uint32_t bytes_to_copy;
@@ -4565,7 +4565,9 @@ tBTA_DM_PEER_DEVICE* allocate_device_for(const RawAddress& bd_addr, 
  return ::allocate_device_for(bd_addr, transport);

}



void bta_dm_remname_cback(void* p) { ::bta_dm_remname_cback(p); }

void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p) {

  ::bta_dm_remname_cback(p);

}



}  // namespace testing

}  // namespace legacy

system/bta/test/bta_dm_test.cc

+4 −4
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ namespace testing { 
tBTA_DM_PEER_DEVICE* allocate_device_for(const RawAddress& bd_addr,

                                         tBT_TRANSPORT transport);



void bta_dm_remname_cback(void* p);

void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p);



}  // namespace testing

}  // namespace legacy
@@ -416,7 +416,7 @@ TEST_F(BtaDmTest, bta_dm_remname_cback__typical) { 
  strlcpy(reinterpret_cast<char*>(&name.remote_bd_name), kRemoteName,

          strlen(kRemoteName));



  bluetooth::legacy::testing::bta_dm_remname_cback(static_cast<void*>(&name));

  bluetooth::legacy::testing::bta_dm_remname_cback(&name);



  sync_main_handler();
@@ -440,7 +440,7 @@ TEST_F(BtaDmTest, bta_dm_remname_cback__wrong_address) { 
  strlcpy(reinterpret_cast<char*>(&name.remote_bd_name), kRemoteName,

          strlen(kRemoteName));



  bluetooth::legacy::testing::bta_dm_remname_cback(static_cast<void*>(&name));

  bluetooth::legacy::testing::bta_dm_remname_cback(&name);



  sync_main_handler();
@@ -464,7 +464,7 @@ TEST_F(BtaDmTest, bta_dm_remname_cback__HCI_ERR_CONNECTION_EXISTS) { 
  strlcpy(reinterpret_cast<char*>(&name.remote_bd_name), kRemoteName,

          strlen(kRemoteName));



  bluetooth::legacy::testing::bta_dm_remname_cback(static_cast<void*>(&name));

  bluetooth::legacy::testing::bta_dm_remname_cback(&name);



  sync_main_handler();

system/main/shim/btm.cc

+2 −2
Original line number Diff line number Diff line
@@ -481,13 +481,13 @@ bool Btm::UseLeLink(const RawAddress& raw_address) const { 
}



BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& raw_address,

                                           tBTM_CMPL_CB* callback) {

                                           tBTM_NAME_CMPL_CB* callback) {

  LOG_ALWAYS_FATAL("unreachable");

  return BTM_UNDEFINED;

}



BtmStatus Btm::ReadLeRemoteDeviceName(const RawAddress& raw_address,

                                      tBTM_CMPL_CB* callback) {

                                      tBTM_NAME_CMPL_CB* callback) {

  if (!CheckLeAclLink(raw_address)) {

    return BTM_UNKNOWN_ADDR;

  }

system/main/shim/btm.h

+2 −2
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ class Btm { 


  // Remote device name API

  BtmStatus ReadClassicRemoteDeviceName(const RawAddress& raw_address,

                                        tBTM_CMPL_CB* callback);

                                        tBTM_NAME_CMPL_CB* callback);

  BtmStatus ReadLeRemoteDeviceName(const RawAddress& raw_address,

                                   tBTM_CMPL_CB* callback);

                                   tBTM_NAME_CMPL_CB* callback);

  BtmStatus CancelAllReadRemoteDeviceName();



  // Le neighbor interaction API

system/main/shim/btm_api.cc

+4 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "main/shim/shim.h"

#include "main/shim/stack.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"
@@ -839,7 +840,7 @@ void bluetooth::shim::BTM_CancelInquiry(void) { 
}



tBTM_STATUS bluetooth::shim::BTM_ReadRemoteDeviceName(

    const RawAddress& raw_address, tBTM_CMPL_CB* callback,

    const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback,

    tBT_TRANSPORT transport) {

  CHECK(callback != nullptr);

  tBTM_STATUS status = BTM_NO_RESOURCES;
@@ -1244,7 +1245,8 @@ uint16_t bluetooth::shim::BTM_GetHCIConnHandle(const RawAddress& remote_bda, 
  return Stack::GetInstance()->GetBtm()->GetAclHandle(remote_bda, transport);

}



static void remote_name_request_complete_noop(void* p_name){

static void remote_name_request_complete_noop(

    UNUSED_ATTR const tBTM_REMOTE_DEV_NAME* p_name){

    // Should notify BTM_Sec, but we should use GD SMP.

};