| Revision | d62e188aa10d2ae9f6f9d961ad364b1489b0e00b (tree) |
|---|---|
| Time | 2017-11-29 09:34:18 |
| Author | android-build-team Robot <android-build-team-robot@goog...> |
| Commiter | android-build-team Robot |
Snap for 4448085 from c8bca5f75eb28620108278b1cf02c744588e0073 to oc-m3-release
Change-Id: Ibb7e6a5573c535c6521f714a5ccff7c92d78a3b0
client_interface_impl.cpp (diff) scanning/offload/offload_scan_manager.cpp (diff)
scanning/offload/offload_scan_manager.h (diff)| @@ -188,7 +188,7 @@ bool ClientInterfaceImpl::DisableSupplicant() { | ||
| 188 | 188 | bool ClientInterfaceImpl::GetPacketCounters(vector<int32_t>* out_packet_counters) { |
| 189 | 189 | StationInfo station_info; |
| 190 | 190 | if (!netlink_utils_->GetStationInfo(interface_index_, |
| 191 | - interface_mac_addr_, | |
| 191 | + bssid_, | |
| 192 | 192 | &station_info)) { |
| 193 | 193 | return false; |
| 194 | 194 | } |
| @@ -199,6 +199,11 @@ bool ClientInterfaceImpl::GetPacketCounters(vector<int32_t>* out_packet_counters | ||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | bool ClientInterfaceImpl::SignalPoll(vector<int32_t>* out_signal_poll_results) { |
| 202 | + if (!IsAssociated()) { | |
| 203 | + LOG(INFO) << "Fail RSSI polling because wifi is not associated."; | |
| 204 | + return false; | |
| 205 | + } | |
| 206 | + | |
| 202 | 207 | StationInfo station_info; |
| 203 | 208 | if (!netlink_utils_->GetStationInfo(interface_index_, |
| 204 | 209 | bssid_, |
| @@ -76,7 +76,6 @@ OffloadScanManager::OffloadScanManager( | ||
| 76 | 76 | wifi_offload_callback_(nullptr), |
| 77 | 77 | death_recipient_(nullptr), |
| 78 | 78 | offload_status_(OffloadScanManager::kError), |
| 79 | - cached_scan_results_(new std::vector<NativeScanResult>()), | |
| 80 | 79 | service_available_(false), |
| 81 | 80 | offload_service_utils_(utils), |
| 82 | 81 | offload_callback_handlers_(new OffloadCallbackHandlersImpl(this)), |
| @@ -239,7 +238,7 @@ OffloadScanManager::StatusCode OffloadScanManager::getOffloadStatus() const { | ||
| 239 | 238 | |
| 240 | 239 | bool OffloadScanManager::getScanResults( |
| 241 | 240 | std::vector<NativeScanResult>* out_scan_results) { |
| 242 | - for (auto scan_result : *cached_scan_results_) { | |
| 241 | + for (const auto& scan_result : cached_scan_results_) { | |
| 243 | 242 | out_scan_results->push_back(scan_result); |
| 244 | 243 | } |
| 245 | 244 | return true; |
| @@ -261,14 +260,13 @@ OffloadScanManager::~OffloadScanManager() { | ||
| 261 | 260 | if (wifi_offload_hal_ != nullptr) { |
| 262 | 261 | wifi_offload_hal_->unlinkToDeath(death_recipient_); |
| 263 | 262 | } |
| 264 | - delete cached_scan_results_; | |
| 265 | 263 | } |
| 266 | 264 | |
| 267 | 265 | void OffloadScanManager::ReportScanResults( |
| 268 | 266 | const vector<ScanResult>& scanResult) { |
| 269 | - cached_scan_results_->clear(); | |
| 267 | + cached_scan_results_.clear(); | |
| 270 | 268 | if (!OffloadScanUtils::convertToNativeScanResults(scanResult, |
| 271 | - cached_scan_results_)) { | |
| 269 | + &cached_scan_results_)) { | |
| 272 | 270 | LOG(WARNING) << "Unable to convert scan results to native format"; |
| 273 | 271 | return; |
| 274 | 272 | } |
| @@ -147,7 +147,7 @@ class OffloadScanManager { | ||
| 147 | 147 | android::sp<OffloadCallback> wifi_offload_callback_; |
| 148 | 148 | android::sp<OffloadDeathRecipient> death_recipient_; |
| 149 | 149 | StatusCode offload_status_; |
| 150 | - std::vector<::com::android::server::wifi::wificond::NativeScanResult>* | |
| 150 | + std::vector<::com::android::server::wifi::wificond::NativeScanResult> | |
| 151 | 151 | cached_scan_results_; |
| 152 | 152 | bool service_available_; |
| 153 | 153 |
Android-x86
Fork