Merge changes from topic 'fuguWifi' into oc-dev

* changes:
  Improve logger feature set handling
  Add capabilities for wifi_hal_legacy
This commit is contained in:
Randy Pan
2017-04-25 16:59:37 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 1 deletions

View File

@@ -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

View File

@@ -316,7 +316,8 @@ std::pair<WifiStatus, uint32_t> 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(