Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d0fb634 authored by Randy Pan's avatar Randy Pan Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'fuguWifi' into oc-dev 

* changes:
  Improve logger feature set handling
  Add capabilities for wifi_hal_legacy
parents 8fcab148 dbb3102b

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

+1 −0
Original line number Diff line number Diff line
@@ -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

wifi/1.0/default/wifi_sta_iface.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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(