wifi_offload_callback_(nullptr),
death_recipient_(nullptr),
offload_status_(OffloadScanManager::kError),
- cached_scan_results_(new std::vector<NativeScanResult>()),
service_available_(false),
offload_service_utils_(utils),
offload_callback_handlers_(new OffloadCallbackHandlersImpl(this)),
bool OffloadScanManager::getScanResults(
std::vector<NativeScanResult>* out_scan_results) {
- for (auto scan_result : *cached_scan_results_) {
+ for (const auto& scan_result : cached_scan_results_) {
out_scan_results->push_back(scan_result);
}
return true;
if (wifi_offload_hal_ != nullptr) {
wifi_offload_hal_->unlinkToDeath(death_recipient_);
}
- delete cached_scan_results_;
}
void OffloadScanManager::ReportScanResults(
const vector<ScanResult>& scanResult) {
- cached_scan_results_->clear();
+ cached_scan_results_.clear();
if (!OffloadScanUtils::convertToNativeScanResults(scanResult,
- cached_scan_results_)) {
+ &cached_scan_results_)) {
LOG(WARNING) << "Unable to convert scan results to native format";
return;
}
android::sp<OffloadCallback> wifi_offload_callback_;
android::sp<OffloadDeathRecipient> death_recipient_;
StatusCode offload_status_;
- std::vector<::com::android::server::wifi::wificond::NativeScanResult>*
+ std::vector<::com::android::server::wifi::wificond::NativeScanResult>
cached_scan_results_;
bool service_available_;