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

Commit 7249f324 authored Jul 23, 2022 by Treehugger Robot Committed by Automerger Merge Worker Jul 23, 2022

Merge "SDP: Set address in tBTM_REMOTE_DEV_NAME" am: 3890fc0a am: 59dcbc58...

Merge "SDP: Set address in tBTM_REMOTE_DEV_NAME" am: 3890fc0a am: 59dcbc58 am: 79567372 am: 83c5fb0c am: 32f9e257

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

Change-Id: I70302c9c6f8e17b87be08c85f4173cecf8fd1eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 8e4eb925 32f9e257

system/bta/dm/bta_dm_act.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -966,7 +966,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr,

		/* Remote name discovery is on going now so BTM cannot notify through
		* "bta_dm_remname_cback" */
		/* adding callback to get notified that current reading remore name done */
		/* adding callback to get notified that current reading remote name done */

		if (bluetooth::shim::is_gd_security_enabled()) {
		bluetooth::shim::BTM_SecAddRmtNameNotifyCallback(
		@@ -1879,6 +1879,8 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

		APPL_TRACE_DEBUG("%s name=<%s>", __func__, bd_name);

		rem_name.bd_addr = bd_addr;

		/* if this is what we are looking for */
		if (bta_dm_search_cb.peer_bdaddr == bd_addr) {
		rem_name.length = strlcpy((char)rem_name.remote_bd_name, (char)bd_name,

system/stack/btm/btm_inq.cc

+3 −0

Original line number	Diff line number	Diff line
		@@ -1443,7 +1443,10 @@ void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,
		uint16_t temp_evt_len;

		if (bda) {
		rem_name.bd_addr = *bda;
		VLOG(2) << "BDA " << *bda;
		} else {
		rem_name.bd_addr = RawAddress::kEmpty;
		}

		VLOG(2) << "Inquire BDA " << p_inq->remname_bda;