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

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

stack::rnr Extract RNR cached name query into rnr module am: 09217c75 am: e7eb0aca 

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



Change-Id: Ifbe249a18281cc3fc30e234a7e60a925f0a5e4db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9000cdf e7eb0aca

system/bta/dm/bta_dm_device_search.cc

+2 −14
Original line number Diff line number Diff line
@@ -31,33 +31,21 @@ 


#include "bta/dm/bta_dm_device_search_int.h"

#include "bta/dm/bta_dm_disc_legacy.h"

#include "bta/include/bta_gatt_api.h"

#include "bta/include/bta_sdp_api.h"

#include "btif/include/btif_config.h"

#include "com_android_bluetooth_flags.h"

#include "common/circular_buffer.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "device/include/interop.h"

#include "internal_include/bt_target.h"

#include "main/shim/dumpsys.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "stack/btm/btm_int_types.h"  // TimestampedStringCircularBuffer

#include "stack/btm/neighbor_inquiry.h"

#include "stack/include/bt_dev_class.h"

#include "stack/include/bt_name.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_inq.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_sec_api.h"  // BTM_IsRemoteNameKnown

#include "stack/include/gap_api.h"      // GAP_BleReadPeerPrefConnParams

#include "stack/include/hidh_api.h"

#include "stack/include/main_thread.h"

#include "stack/include/sdp_status.h"

#include "stack/sdp/sdpint.h"  // is_sdp_pbap_pce_disabled

#include "storage/config_keys.h"

#include "stack/rnr/remote_name_request.h"

#include "types/raw_address.h"



using namespace bluetooth;

system/bta/dm/bta_dm_disc_legacy.cc

+2 −1
Original line number Diff line number Diff line
@@ -47,14 +47,15 @@ 
#include "stack/include/bt_dev_class.h"

#include "stack/include/bt_name.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_inq.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_sec_api.h"  // BTM_IsRemoteNameKnown

#include "stack/include/gap_api.h"      // GAP_BleReadPeerPrefConnParams

#include "stack/include/hidh_api.h"

#include "stack/include/main_thread.h"

#include "stack/include/sdp_status.h"

#include "stack/rnr/remote_name_request.h"

#include "stack/sdp/sdpint.h"  // is_sdp_pbap_pce_disabled

#include "storage/config_keys.h"

#include "types/raw_address.h"

system/stack/btm/btm_dev.cc

+0 −9
Original line number Diff line number Diff line
@@ -36,11 +36,8 @@ 
#include "btm_sec_api.h"

#include "btm_sec_cb.h"

#include "common/init_flags.h"

#include "hci/controller_interface.h"

#include "internal_include/bt_target.h"

#include "l2c_api.h"

#include "main/shim/entry.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "rust/src/connection/ffi/connection_shim.h"

#include "stack/btm/btm_sec.h"
@@ -746,12 +743,6 @@ const tBLE_BD_ADDR BTM_Sec_GetAddressWithType(const RawAddress& bd_addr) { 
  }

}



bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr,

                           tBT_TRANSPORT /* transport */) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  return (p_dev_rec == nullptr) ? false : p_dev_rec->sec_rec.is_name_known();

}



namespace bluetooth {

namespace testing {

namespace legacy {

system/stack/btm/btm_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -192,5 +192,3 @@ std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec(); 


bool BTM_Sec_AddressKnown(const RawAddress& address);

const tBLE_BD_ADDR BTM_Sec_GetAddressWithType(const RawAddress& bd_addr);
 


bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport);

system/stack/include/btm_sec_api.h

+0 −16
Original line number Diff line number Diff line
@@ -110,19 +110,3 @@ tBTM_STATUS BTM_DeleteStoredLinkKey(const RawAddress* bd_addr, 
void BTM_BleSirkConfirmDeviceReply(const RawAddress& bd_addr, uint8_t res);



uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr);
 


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

 *

 * Function         BTM_IsRemoteNameKnown

 *

 * Description      This function checks if the remote name is known.

 *

 * Input Params:    bd_addr: Address of remote

 *                  transport: Transport, auto if unknown

 *

 * Returns

 *                  true if name is known, false otherwise

 *

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

bool BTM_IsRemoteNameKnown(const RawAddress& remote_bda,

                           tBT_TRANSPORT transport);