Merge "GD: Load resolving list on peer irk notification" (d00b5a8d) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_ble.cc

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -141,8 +141,8 @@ void BTM_SecAddBleKey(const RawAddress& bd_addr, tBTM_LE_KEY_VALUE* p_le_key,
	key_type);		key_type);

	btm_sec_save_le_key(bd_addr, key_type, p_le_key, false);		btm_sec_save_le_key(bd_addr, key_type, p_le_key, false);
			// Only set peer irk. Local irk is always the same.
	if (key_type == BTM_LE_KEY_PID \|\| key_type == BTM_LE_KEY_LID) {		if (key_type == BTM_LE_KEY_PID) {
	btm_ble_resolving_list_load_dev(*p_dev_rec);		btm_ble_resolving_list_load_dev(*p_dev_rec);
	}		}
	}		}

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -647,10 +647,6 @@ static void btm_ble_ble_unsupported_resolving_list_load_dev(
	return;		return;
	}		}

	static bool is_local_identity_key_valid(const tBTM_SEC_DEV_REC& dev_rec) {
	return dev_rec.ble.key_type & BTM_LE_KEY_LID;
	}

	static bool is_peer_identity_key_valid(const tBTM_SEC_DEV_REC& dev_rec) {		static bool is_peer_identity_key_valid(const tBTM_SEC_DEV_REC& dev_rec) {
	return dev_rec.ble.key_type & BTM_LE_KEY_PID;		return dev_rec.ble.key_type & BTM_LE_KEY_PID;
	}		}
	@@ -667,8 +663,8 @@ void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& dev_rec) {
	return btm_ble_ble_unsupported_resolving_list_load_dev(&dev_rec);		return btm_ble_ble_unsupported_resolving_list_load_dev(&dev_rec);
	}		}

	if (!is_local_identity_key_valid(dev_rec) &&		// No need to check for local identity key validity. It remains unchanged.
	!is_peer_identity_key_valid(dev_rec)) {		if (!is_peer_identity_key_valid(dev_rec)) {
	LOG_INFO("Peer is not an RPA enabled device:%s",		LOG_INFO("Peer is not an RPA enabled device:%s",
	PRIVATE_ADDRESS(dev_rec.ble.identity_address_with_type));		PRIVATE_ADDRESS(dev_rec.ble.identity_address_with_type));
	return;		return;