commit cd7f21fcc03416153ea2fc2093a82a9cd3350fea
author Sohani Rao <sohanirao@google.com> Thu Sep 14 03:36:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 03:36:42 2017 +0000
tree 1170ac80113673d0f617f38334c55a224173c543
parent 874d6289a3ac118681f6780aef9c61b372b18341
parent de45b50b17f0f8c92977c0a69f5d50ca393d84cc

Merge "Wificond: Remove mannual memory management in OffloadScanManager" into oc-mr1-dev
am: de45b50b17

Change-Id: Iaf059d37c1657f5ecc73d21f1b871082316ec72a

scanning/offload/offload_scan_manager.cpp

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 @@
       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 @@
 
 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 @@
   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;
   }

scanning/offload/offload_scan_manager.h

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 @@
   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_;