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

Commit b7c3fcec authored by Mahesh KKV's avatar Mahesh KKV Committed by Android (Google) Code Review
Browse files

Merge "Rename maxMloLinkCount to maxMloStrLinkCount"

parents 00eed115 21a98b4a

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

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
package android.hardware.wifi;

@VintfStability

parcelable WifiChipCapabilities {

  int maxMloLinkCount;

  int maxMloStrLinkCount;

  int maxConcurrentTdlsSessionCount;

}

wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl

+4 −4
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ package android.hardware.wifi; 
@VintfStability

parcelable WifiChipCapabilities {

    /**

     * Maximum number of links used in Multi-Link Operation. The maximum

     * number of links used for MLO can be different from the number of

     * radios supported by the chip.

     * Maximum number of Simultaneous Transmit and Receive (STR) links used

     * in Multi-Link Operation. The maximum number of STR links used can be

     * different from the maximum number of radios supported by the chip.

     *

     * This is a static configuration of the chip.

     */

    int maxMloLinkCount;

    int maxMloStrLinkCount;

    /**

     * Maximum number of concurrent TDLS sessions that can be enabled

     * by framework via ISupplicantStaIface#initiateTdlsSetup().

wifi/aidl/default/aidl_struct_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3316,7 +3316,7 @@ bool convertLegacyNanBootstrappingConfirmIndToAidl( 
bool convertLegacyWifiChipCapabilitiesToAidl(

        const legacy_hal::wifi_chip_capabilities& legacy_chip_capabilities,

        WifiChipCapabilities& aidl_chip_capabilities) {

    aidl_chip_capabilities.maxMloLinkCount = legacy_chip_capabilities.max_mlo_link_count;

    aidl_chip_capabilities.maxMloStrLinkCount = legacy_chip_capabilities.max_mlo_str_link_count;

    aidl_chip_capabilities.maxConcurrentTdlsSessionCount =

            legacy_chip_capabilities.max_concurrent_tdls_session_count;

    return true;