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

Commit 2d5f8ca9 authored by Kai Shi's avatar Kai Shi Committed by Android (Google) Code Review
Browse files

Merge "Add capability bit for the cached scan data feature" into main

parents 84c0d6a4 df773624

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

+1 −0
Original line number Diff line number Diff line
@@ -79,5 +79,6 @@ interface IWifiStaIface { 
    ND_OFFLOAD = (1 << 12) /* 4096 */,

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

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

    CACHED_SCAN_DATA = (1 << 15) /* 32768 */,

  }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ interface IWifiStaIface { 
         * Support for configuring roaming mode.

         */

        ROAMING_MODE_CONTROL = 1 << 14,

        /**

         * Support for cached scan data report.

         */

        CACHED_SCAN_DATA = 1 << 15,

    }



    /**

wifi/aidl/default/aidl_struct_util.cpp

+3 −1
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ IWifiStaIface::FeatureSetMask convertLegacyStaIfaceFeatureToAidl(uint64_t featur 
            return IWifiStaIface::FeatureSetMask::KEEP_ALIVE;

        case WIFI_FEATURE_ROAMING_MODE_CONTROL:

            return IWifiStaIface::FeatureSetMask::ROAMING_MODE_CONTROL;

        case WIFI_FEATURE_CACHED_SCAN_RESULTS:

            return IWifiStaIface::FeatureSetMask::CACHED_SCAN_DATA;

    };

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

    return {};
@@ -463,7 +465,7 @@ bool convertLegacyStaIfaceFeaturesToAidl(uint64_t legacy_feature_set, uint32_t* 
          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_ROAMING_MODE_CONTROL}) {

          WIFI_FEATURE_ROAMING_MODE_CONTROL, WIFI_FEATURE_CACHED_SCAN_RESULTS}) {

        if (feature & legacy_feature_set) {

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

        }