Merge "csis: Fix bonding dual mode devices" into main (89d04b14) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/csis/csis_client.cc

+24 −0

Original line number	Diff line number	Diff line
		@@ -1314,6 +1314,18 @@ class CsisClientImpl : public CsisClient {
		return;
		}

		/* Make sure device is not already bonded which could
		* be a case for dual mode devices where
		*/
		tBTM_SEC_DEV_REC* p_dev = btm_find_dev(result->bd_addr);
		if (p_dev && p_dev->is_le_link_key_known()) {
		LOG_VERBOSE(
		"Device %s already bonded. Identity address: %s",
		ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr),
		ADDRESS_TO_LOGGABLE_CSTR(p_dev->ble.identity_address_with_type));
		return;
		}

		auto all_rsi = GetAllRsiFromAdvertising(result);
		if (all_rsi.empty()) return;

		@@ -1454,6 +1466,18 @@ class CsisClientImpl : public CsisClient {
		return;
		}

		/* Make sure device is not already bonded which could
		* be a case for dual mode devices where
		*/
		tBTM_SEC_DEV_REC* p_dev = btm_find_dev(result->bd_addr);
		if (p_dev && p_dev->is_le_link_key_known()) {
		LOG_VERBOSE(
		"Device %s already bonded. Identity address: %s",
		ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr),
		ADDRESS_TO_LOGGABLE_CSTR(p_dev->ble.identity_address_with_type));
		return;
		}

		auto all_rsi = GetAllRsiFromAdvertising(result);
		if (all_rsi.empty()) return;