wifi: Reset internal callback pointers on failure (3a41df3f) · Commits · e / os / android_hardware_interfaces

wifi/1.0/default/wifi_legacy_hal.cpp

+20 −11

Original line number	Original line	Diff line number	Diff line
	@@ -571,12 +571,16 @@ wifi_error WifiLegacyHal::startRssiMonitoring(
	std::copy(bssid_ptr, bssid_ptr + 6, std::begin(bssid_arr));		std::copy(bssid_ptr, bssid_ptr + 6, std::begin(bssid_arr));
	on_threshold_breached_user_callback(id, bssid_arr, rssi);		on_threshold_breached_user_callback(id, bssid_arr, rssi);
	};		};
	return global_func_table_.wifi_start_rssi_monitoring(		wifi_error status =
	id,		global_func_table_.wifi_start_rssi_monitoring(id,
	wlan_interface_handle_,		wlan_interface_handle_,
	max_rssi,		max_rssi,
	min_rssi,		min_rssi,
	{onRssiThresholdBreached});		{onRssiThresholdBreached});
			if (status != WIFI_SUCCESS) {
			on_rssi_threshold_breached_internal_callback = nullptr;
			}
			return status;
	}		}

	wifi_error WifiLegacyHal::stopRssiMonitoring(wifi_request_id id) {		wifi_error WifiLegacyHal::stopRssiMonitoring(wifi_request_id id) {
	@@ -751,11 +755,16 @@ wifi_error WifiLegacyHal::startRttRangeRequest(
	};		};

	std::vector<wifi_rtt_config> rtt_configs_internal(rtt_configs);		std::vector<wifi_rtt_config> rtt_configs_internal(rtt_configs);
	return global_func_table_.wifi_rtt_range_request(id,		wifi_error status =
			global_func_table_.wifi_rtt_range_request(id,
	wlan_interface_handle_,		wlan_interface_handle_,
	rtt_configs.size(),		rtt_configs.size(),
	rtt_configs_internal.data(),		rtt_configs_internal.data(),
	{onRttResults});		{onRttResults});
			if (status != WIFI_SUCCESS) {
			on_rtt_results_internal_callback = nullptr;
			}
			return status;
	}		}

	wifi_error WifiLegacyHal::cancelRttRangeRequest(		wifi_error WifiLegacyHal::cancelRttRangeRequest(