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

Commit eb508f78 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Add capability bit for the roaming mode feature in the Vendor HAL interface." into main

parents b9fe5cd8 b8c242ab

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl

+1 −0
Original line number Diff line number Diff line
@@ -77,5 +77,6 @@ interface IWifiStaIface { 
    TDLS_OFFCHANNEL = (1 << 11) /* 2048 */,

    ND_OFFLOAD = (1 << 12) /* 4096 */,

    KEEP_ALIVE = (1 << 13) /* 8192 */,

    ROAMING_MODE_CONTROL = (1 << 14) /* 16384 */,

  }

}

wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl

+4 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ interface IWifiStaIface { 
         * Support for keep alive packet offload.

         */

        KEEP_ALIVE = 1 << 13,

        /**

         * Support for configuring roaming mode.

         */

        ROAMING_MODE_CONTROL = 1 << 14,

    }



    /**

wifi/aidl/default/aidl_struct_util.cpp

+4 −1
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ IWifiStaIface::FeatureSetMask convertLegacyStaIfaceFeatureToAidl(uint64_t featur 
            return IWifiStaIface::FeatureSetMask::ND_OFFLOAD;

        case WIFI_FEATURE_MKEEP_ALIVE:

            return IWifiStaIface::FeatureSetMask::KEEP_ALIVE;

        case WIFI_FEATURE_ROAMING_MODE_CONTROL:

            return IWifiStaIface::FeatureSetMask::ROAMING_MODE_CONTROL;

    };

    CHECK(false) << "Unknown legacy feature: " << feature;

    return {};
@@ -457,7 +459,8 @@ bool convertLegacyStaIfaceFeaturesToAidl(uint64_t legacy_feature_set, uint32_t* 
         {WIFI_FEATURE_GSCAN, WIFI_FEATURE_LINK_LAYER_STATS, WIFI_FEATURE_RSSI_MONITOR,

          WIFI_FEATURE_CONTROL_ROAMING, WIFI_FEATURE_IE_WHITELIST, WIFI_FEATURE_SCAN_RAND,

          WIFI_FEATURE_INFRA_5G, WIFI_FEATURE_HOTSPOT, WIFI_FEATURE_PNO, WIFI_FEATURE_TDLS,

          WIFI_FEATURE_TDLS_OFFCHANNEL, WIFI_FEATURE_CONFIG_NDO, WIFI_FEATURE_MKEEP_ALIVE}) {

          WIFI_FEATURE_TDLS_OFFCHANNEL, WIFI_FEATURE_CONFIG_NDO, WIFI_FEATURE_MKEEP_ALIVE,

          WIFI_FEATURE_ROAMING_MODE_CONTROL}) {

        if (feature & legacy_feature_set) {

            *aidl_feature_set |= static_cast<uint32_t>(convertLegacyStaIfaceFeatureToAidl(feature));

        }