diff options
author | android-build-team Robot | 2017-09-03 02:35:16 -0500 |
---|---|---|
committer | android-build-team Robot | 2017-09-03 02:35:16 -0500 |
commit | 90bd8c74ed3c09cf29e27ea40c5d59a1fcc49271 (patch) | |
tree | 5a63d4205696ba8bcf273d011d3514aac213de3b | |
parent | defb868a24c024b2b50ed16ae7ca50fc45cbb88e (diff) | |
parent | c9cee96d62dd2d91d0cff2c55e5f1ee8de96b1ed (diff) | |
download | system-connectivity-wificond-90bd8c74ed3c09cf29e27ea40c5d59a1fcc49271.tar.gz system-connectivity-wificond-90bd8c74ed3c09cf29e27ea40c5d59a1fcc49271.tar.xz system-connectivity-wificond-90bd8c74ed3c09cf29e27ea40c5d59a1fcc49271.zip |
release-request-957cd691-fb71-4770-8ff7-a3b9602655a5-for-git_oc-mr1-release-4314464 snap-temp-L54400000099147910
Change-Id: I3af64f27adbce5b669336227cd5abab8e9f85093
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | scanning/offload/offload_service_utils.cpp | 6 | ||||
-rw-r--r-- | scanning/scanner_impl.cpp | 3 |
3 files changed, 10 insertions, 0 deletions
@@ -200,6 +200,7 @@ LOCAL_SHARED_LIBRARIES := \ | |||
200 | android.hardware.wifi.offload@1.0 \ | 200 | android.hardware.wifi.offload@1.0 \ |
201 | libbase \ | 201 | libbase \ |
202 | libbinder \ | 202 | libbinder \ |
203 | libcutils \ | ||
203 | libhidltransport \ | 204 | libhidltransport \ |
204 | libhidlbase \ | 205 | libhidlbase \ |
205 | libhwbinder \ | 206 | libhwbinder \ |
diff --git a/scanning/offload/offload_service_utils.cpp b/scanning/offload/offload_service_utils.cpp index ce25d85..d91f069 100644 --- a/scanning/offload/offload_service_utils.cpp +++ b/scanning/offload/offload_service_utils.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | #include "wificond/scanning/offload/offload_service_utils.h" | 16 | #include "wificond/scanning/offload/offload_service_utils.h" |
17 | 17 | ||
18 | #include <android-base/logging.h> | 18 | #include <android-base/logging.h> |
19 | #include <cutils/properties.h> | ||
19 | 20 | ||
20 | #include "wificond/scanning/offload/offload_scan_manager.h" | 21 | #include "wificond/scanning/offload/offload_scan_manager.h" |
21 | #include "wificond/scanning/scanner_impl.h" | 22 | #include "wificond/scanning/scanner_impl.h" |
@@ -40,6 +41,11 @@ OffloadDeathRecipient* OffloadServiceUtils::GetOffloadDeathRecipient( | |||
40 | } | 41 | } |
41 | 42 | ||
42 | bool OffloadServiceUtils::IsOffloadScanSupported() const { | 43 | bool OffloadServiceUtils::IsOffloadScanSupported() const { |
44 | if (property_get_bool("persist.wifi.offload.enable", false)) { | ||
45 | LOG(INFO) << "Offload HAL supported"; | ||
46 | return true; | ||
47 | } | ||
48 | LOG(INFO) << "Offload HAL not supported "; | ||
43 | return false; | 49 | return false; |
44 | } | 50 | } |
45 | 51 | ||
diff --git a/scanning/scanner_impl.cpp b/scanning/scanner_impl.cpp index 0f6ab52..e09c7a1 100644 --- a/scanning/scanner_impl.cpp +++ b/scanning/scanner_impl.cpp | |||
@@ -551,6 +551,9 @@ void ScannerImpl::OnOffloadError( | |||
551 | success = StartPnoScanDefault(pno_settings_); | 551 | success = StartPnoScanDefault(pno_settings_); |
552 | if (success) { | 552 | if (success) { |
553 | LOG(INFO) << "Pno scans restarted"; | 553 | LOG(INFO) << "Pno scans restarted"; |
554 | } else { | ||
555 | LOG(ERROR) << "Unable to fall back to netlink pno scan"; | ||
556 | pno_scan_event_handler_->OnPnoScanFailed(); | ||
554 | } | 557 | } |
555 | } | 558 | } |
556 | 559 | ||