Merge "Check remote address before trigger name callback" (bff45ba1) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1933,12 +1933,14 @@ static void bta_dm_remname_cback(void* p) {
	strlcpy((char*)bta_dm_search_cb.peer_name,		strlcpy((char*)bta_dm_search_cb.peer_name,
	(char*)p_remote_name->remote_bd_name, BD_NAME_LEN + 1);		(char*)p_remote_name->remote_bd_name, BD_NAME_LEN + 1);

			if (bta_dm_search_cb.peer_bdaddr == p_remote_name->bd_addr) {
	if (bluetooth::shim::is_gd_security_enabled()) {		if (bluetooth::shim::is_gd_security_enabled()) {
	bluetooth::shim::BTM_SecDeleteRmtNameNotifyCallback(		bluetooth::shim::BTM_SecDeleteRmtNameNotifyCallback(
	&bta_dm_service_search_remname_cback);		&bta_dm_service_search_remname_cback);
	} else {		} else {
	BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);		BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);
	}		}
			}

	if (bta_dm_search_cb.transport == BT_TRANSPORT_LE) {		if (bta_dm_search_cb.transport == BT_TRANSPORT_LE) {
	GAP_BleReadPeerPrefConnParams(bta_dm_search_cb.peer_bdaddr);		GAP_BleReadPeerPrefConnParams(bta_dm_search_cb.peer_bdaddr);