diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-14 07:29:14 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-14 07:29:14 +0000 |
| commit | 7011cb5ab8485121d8563df675236d5221b5d736 (patch) | |
| tree | fe636d69a8d731de9284da732429f14fb7a5d8d0 | |
| parent | 90bd8c74ed3c09cf29e27ea40c5d59a1fcc49271 (diff) | |
| parent | de45b50b17f0f8c92977c0a69f5d50ca393d84cc (diff) | |
| download | wificond-7011cb5ab8485121d8563df675236d5221b5d736.tar.gz | |
release-request-f0fc1aa1-730c-4deb-b1ff-e8ebeeccc4b5-for-git_oc-mr1-release-4335659 snap-temp-L85900000102427279
Change-Id: Iff793faf0499a95b429b5015a62004013ff81524
| -rw-r--r-- | scanning/offload/offload_scan_manager.cpp | 8 | ||||
| -rw-r--r-- | scanning/offload/offload_scan_manager.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/scanning/offload/offload_scan_manager.cpp b/scanning/offload/offload_scan_manager.cpp index 2592aee..9bcbb0f 100644 --- a/scanning/offload/offload_scan_manager.cpp +++ b/scanning/offload/offload_scan_manager.cpp @@ -76,7 +76,6 @@ OffloadScanManager::OffloadScanManager( 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)), @@ -239,7 +238,7 @@ OffloadScanManager::StatusCode OffloadScanManager::getOffloadStatus() const { 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; @@ -261,14 +260,13 @@ OffloadScanManager::~OffloadScanManager() { 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; } diff --git a/scanning/offload/offload_scan_manager.h b/scanning/offload/offload_scan_manager.h index 6be3ec0..2c4fa96 100644 --- a/scanning/offload/offload_scan_manager.h +++ b/scanning/offload/offload_scan_manager.h @@ -147,7 +147,7 @@ class OffloadScanManager { 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_; |