| commit | d04ec801df4fba79346a9349b83d9dcaec40d3e4 | [log] [tgz] |
|---|---|---|
| author | Randy Pan <zpan@google.com> | Tue Apr 25 17:20:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 25 17:20:51 2017 +0000 |
| tree | 26e4456aa8bbc9fc51c6cdf16e67a60167e89b6c | |
| parent | d7b16e14c27b97a0bbeb0ba6825d0e5987daf5b7 [diff] | |
| parent | 0d0fb634ec3a3aaf823e639b60e33fa5d3cbc5b8 [diff] |
Merge changes from topic 'fuguWifi' into oc-dev am: 0d0fb634ec Change-Id: I2617fe15174d5ca808e48d21fd5d4f9ac0f99778
diff --git a/wifi/1.0/default/android.hardware.wifi@1.0-service.rc b/wifi/1.0/default/android.hardware.wifi@1.0-service.rc index 696b1f9..3672423 100644 --- a/wifi/1.0/default/android.hardware.wifi@1.0-service.rc +++ b/wifi/1.0/default/android.hardware.wifi@1.0-service.rc
@@ -2,3 +2,4 @@ class hal user wifi group wifi gps + capabilities NET_ADMIN NET_RAW
diff --git a/wifi/1.0/default/wifi_sta_iface.cpp b/wifi/1.0/default/wifi_sta_iface.cpp index 0b75ccb..3c52048 100644 --- a/wifi/1.0/default/wifi_sta_iface.cpp +++ b/wifi/1.0/default/wifi_sta_iface.cpp
@@ -316,7 +316,8 @@ std::tie(legacy_status, legacy_logger_feature_set) = legacy_hal_.lock()->getLoggerSupportedFeatureSet(); if (legacy_status != legacy_hal::WIFI_SUCCESS) { - return {createWifiStatusFromLegacyError(legacy_status), 0}; + // some devices don't support querying logger feature set + legacy_logger_feature_set = 0; } uint32_t hidl_caps; if (!hidl_struct_util::convertLegacyFeaturesToHidlStaCapabilities(