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

Commit 00a493d1 authored Mar 24, 2023 by Thomas Girardier Committed by Automerger Merge Worker Mar 24, 2023

Merge "Fix upper (framework) can not get RC's name or other properties" am:...

Merge "Fix upper (framework) can not get RC's name or other properties" am: 460b8a66 am: 15add121

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

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

parents e13e0dc4 15add121

system/btif/src/btif_ble_scanner.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ void bta_scan_results_cb_impl(RawAddress bd_addr, tBT_DEVICE_TYPE device_type,
		value, HCI_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);
		}

		if ((addr_type != BLE_ADDR_RANDOM) \|\| (p_eir_remote_name)) {
		if (p_eir_remote_name) {
		if (!btif_address_cache_find(bd_addr)) {
		btif_address_cache_add(bd_addr, addr_type);

system/main/shim/le_scanning_manager.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -758,7 +758,7 @@ void BleScannerInterfaceImpl::handle_remote_properties(
		}

		// update device name
		if ((addr_type != BLE_ADDR_RANDOM) \|\| (p_eir_remote_name)) {
		if (p_eir_remote_name) {
		if (!address_cache_.find(bd_addr)) {
		address_cache_.add(bd_addr);