From 1addbeaa4672adae37ade6784d7a99b6bf1e0604 Mon Sep 17 00:00:00 2001 From: Randy Pan Date: Thu, 13 Apr 2017 10:00:34 -0700 Subject: [PATCH 1/2] Add capabilities for wifi_hal_legacy Bug: 37105075 Bug: 37483427 Test: Fugu Wifi VendorHal initializes successfully Change-Id: If30aa641e42a9a4be435db97f36af4d172eb8ebe --- wifi/1.0/default/android.hardware.wifi@1.0-service.rc | 1 + 1 file changed, 1 insertion(+) 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 696b1f9338..3672423dae 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 @@ service wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service class hal user wifi group wifi gps + capabilities NET_ADMIN NET_RAW From dbb3102bdd1c6692c6b0d3b210b87d8ddcff7222 Mon Sep 17 00:00:00 2001 From: Randy Pan Date: Thu, 20 Apr 2017 10:03:41 -0700 Subject: [PATCH 2/2] Improve logger feature set handling Some devices don't support querying logger feature set. In that case set the logger feature set value to 0 instead of failing the query for regular WiFi feature set. Bug: 37105075 Bug: 37483427 Test: get battery stats on Fugu. Change-Id: I3e162f8ddeaaa1965b41518592a253c6c90ddfa7 --- wifi/1.0/default/wifi_sta_iface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/1.0/default/wifi_sta_iface.cpp b/wifi/1.0/default/wifi_sta_iface.cpp index 626b195bbb..611da94351 100644 --- a/wifi/1.0/default/wifi_sta_iface.cpp +++ b/wifi/1.0/default/wifi_sta_iface.cpp @@ -309,7 +309,8 @@ std::pair WifiStaIface::getCapabilitiesInternal() { 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(