commit 0d0fb634ec3a3aaf823e639b60e33fa5d3cbc5b8
author Randy Pan <zpan@google.com> Tue Apr 25 16:59:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 25 16:59:39 2017 +0000
tree 94502a2947f18c60fe0123b29d8d2791e74c9753
parent 8fcab148c2b188dc995bfcf67b6e48f6b6a0cc92
parent dbb3102bdd1c6692c6b0d3b210b87d8ddcff7222

Merge changes from topic 'fuguWifi' into oc-dev

* changes:
  Improve logger feature set handling
  Add capabilities for wifi_hal_legacy

wifi/1.0/default/android.hardware.wifi@1.0-service.rc

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

wifi/1.0/default/wifi_sta_iface.cpp

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(