wifi: Reset internal callback pointers on failure am: 7a41d9d59f am: 3a41df3ffb

am: 2c800a1fc3

Change-Id: I6cc3f1929a944b097a7119fccba4679f55007e37
This commit is contained in:
Roshan Pius
2016-12-09 02:15:51 +00:00
committed by android-build-merger

View File

@@ -571,12 +571,16 @@ wifi_error WifiLegacyHal::startRssiMonitoring(
std::copy(bssid_ptr, bssid_ptr + 6, std::begin(bssid_arr));
on_threshold_breached_user_callback(id, bssid_arr, rssi);
};
return global_func_table_.wifi_start_rssi_monitoring(
id,
wlan_interface_handle_,
max_rssi,
min_rssi,
{onRssiThresholdBreached});
wifi_error status =
global_func_table_.wifi_start_rssi_monitoring(id,
wlan_interface_handle_,
max_rssi,
min_rssi,
{onRssiThresholdBreached});
if (status != WIFI_SUCCESS) {
on_rssi_threshold_breached_internal_callback = nullptr;
}
return status;
}
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);
return global_func_table_.wifi_rtt_range_request(id,
wlan_interface_handle_,
rtt_configs.size(),
rtt_configs_internal.data(),
{onRttResults});
wifi_error status =
global_func_table_.wifi_rtt_range_request(id,
wlan_interface_handle_,
rtt_configs.size(),
rtt_configs_internal.data(),
{onRttResults});
if (status != WIFI_SUCCESS) {
on_rtt_results_internal_callback = nullptr;
}
return status;
}
wifi_error WifiLegacyHal::cancelRttRangeRequest(