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

Commit e0e6f11f authored by Yi Shiou (Les) Lee's avatar Yi Shiou (Les) Lee Committed by Android (Google) Code Review
Browse files

Merge "wifi: Upgrade vendor hal version" into main

parents f2650b05 5ea0e25f

compatibility_matrices/compatibility_matrix.202504.xml

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ 
    </hal>

    <hal format="aidl" updatable-via-apex="true">

        <name>android.hardware.wifi</name>

        <version>1-2</version>

        <version>2-3</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

wifi/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -64,5 +64,5 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,

}

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ interface IWifiChip { 
    SET_AFC_CHANNEL_ALLOWANCE = (1 << 7) /* 128 */,

    T2LM_NEGOTIATION = (1 << 8) /* 256 */,

    SET_VOIP_MODE = (1 << 9) /* 512 */,

    MLO_SAP = (1 << 10) /* 1024 */,

  }

  @VintfStability

  parcelable ChipConcurrencyCombinationLimit {

wifi/aidl/android/hardware/wifi/IWifiChip.aidl

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ interface IWifiChip { 
         * Chip supports voip mode setting.

         */

        SET_VOIP_MODE = 1 << 9,

        /**

         * Chip supports Wi-Fi 7 MLO SoftAp.

         */

        MLO_SAP = 1 << 10,

    }



    /**

wifi/aidl/default/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ cc_library_static { 
        "libwifi-hal",

        "libwifi-system-iface",

        "libxml2",

        "android.hardware.wifi-V2-ndk",

        "android.hardware.wifi-V3-ndk",

    ],



    export_include_dirs: ["."],
@@ -138,7 +138,7 @@ cc_binary { 
        "libwifi-hal",

        "libwifi-system-iface",

        "libxml2",

        "android.hardware.wifi-V2-ndk",

        "android.hardware.wifi-V3-ndk",

    ],

    static_libs: ["android.hardware.wifi-service-lib"],

    init_rc: ["android.hardware.wifi-service.rc"],
@@ -167,7 +167,7 @@ cc_binary { 
        "libwifi-hal",

        "libwifi-system-iface",

        "libxml2",

        "android.hardware.wifi-V2-ndk",

        "android.hardware.wifi-V3-ndk",

    ],

    static_libs: ["android.hardware.wifi-service-lib"],

    init_rc: ["android.hardware.wifi-service-lazy.rc"],
@@ -199,7 +199,7 @@ cc_test { 
    static_libs: [

        "libgmock",

        "libgtest",

        "android.hardware.wifi-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "android.hardware.wifi.common-V1-ndk",

        "android.hardware.wifi-service-lib",

    ],