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

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

Merge "Remove unused DEBUG_PACKET_FATE capability from StaIfaceCapabilityMask."

parents c0da5956 dd47e716

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

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

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

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

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

  }

}

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

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

         */

        KEEP_ALIVE = 1 << 13,

        /**

         * Support for tracking connection packets' fate.

         */

        DEBUG_PACKET_FATE = 1 << 14,

    }



    /**

wifi/aidl/default/aidl_struct_util.cpp

+1 −19
Original line number Diff line number Diff line
@@ -41,16 +41,6 @@ inline std::vector<int32_t> uintToIntVec(const std::vector<uint32_t>& in) { 
    return std::vector<int32_t>(in.begin(), in.end());

}



IWifiStaIface::StaIfaceCapabilityMask convertLegacyLoggerFeatureToAidlStaIfaceCapability(

        uint32_t feature) {

    switch (feature) {

        case legacy_hal::WIFI_LOGGER_PACKET_FATE_SUPPORTED:

            return IWifiStaIface::StaIfaceCapabilityMask::DEBUG_PACKET_FATE;

    };

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

    return {};

}



IWifiChip::ChipCapabilityMask convertLegacyFeatureToAidlChipCapability(uint64_t feature) {

    switch (feature) {

        case WIFI_FEATURE_SET_TX_POWER_LIMIT:
@@ -459,19 +449,11 @@ bool convertLegacyWifiMacInfosToAidl( 
    return true;

}



bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set,

                                                uint32_t legacy_logger_feature_set,

                                                uint32_t* aidl_caps) {

bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set, uint32_t* aidl_caps) {

    if (!aidl_caps) {

        return false;

    }

    *aidl_caps = {};

    for (const auto feature : {legacy_hal::WIFI_LOGGER_PACKET_FATE_SUPPORTED}) {

        if (feature & legacy_logger_feature_set) {

            *aidl_caps |= static_cast<uint32_t>(

                    convertLegacyLoggerFeatureToAidlStaIfaceCapability(feature));

        }

    }

    for (const auto feature :

         {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/aidl/default/aidl_struct_util.h

+1 −3
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ WifiBand convertLegacyMacBandToAidlWifiBand(uint32_t band); 
WifiAntennaMode convertLegacyAntennaConfigurationToAidl(uint32_t antenna_cfg);



// STA iface conversion methods.

bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set,

                                                uint32_t legacy_logger_feature_set,

                                                uint32_t* aidl_caps);

bool convertLegacyFeaturesToAidlStaCapabilities(uint64_t legacy_feature_set, uint32_t* aidl_caps);

bool convertLegacyApfCapabilitiesToAidl(const legacy_hal::PacketFilterCapabilities& legacy_caps,

                                        StaApfPacketFilterCapabilities* aidl_caps);

bool convertLegacyGscanCapabilitiesToAidl(const legacy_hal::wifi_gscan_capabilities& legacy_caps,

wifi/aidl/default/wifi_sta_iface.cpp

+2 −9
Original line number Diff line number Diff line
@@ -249,16 +249,9 @@ WifiStaIface::getCapabilitiesInternal() { 
        return {IWifiStaIface::StaIfaceCapabilityMask{},

                createWifiStatusFromLegacyError(legacy_status)};

    }

    uint32_t legacy_logger_feature_set;

    std::tie(legacy_status, legacy_logger_feature_set) =

            legacy_hal_.lock()->getLoggerSupportedFeatureSet(ifname_);

    if (legacy_status != legacy_hal::WIFI_SUCCESS) {

        // some devices don't support querying logger feature set

        legacy_logger_feature_set = 0;

    }

    uint32_t aidl_caps;

    if (!aidl_struct_util::convertLegacyFeaturesToAidlStaCapabilities(

                legacy_feature_set, legacy_logger_feature_set, &aidl_caps)) {

    if (!aidl_struct_util::convertLegacyFeaturesToAidlStaCapabilities(legacy_feature_set,

                                                                      &aidl_caps)) {

        return {IWifiStaIface::StaIfaceCapabilityMask{},

                createWifiStatus(WifiStatusCode::ERROR_UNKNOWN)};

    }