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

Commit 86887a1c authored by Sunil Ravi's avatar Sunil Ravi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "supplicant_aidl_v4" into main 

* changes:
  Add RSN overriding feature flag
  wifi: Update Supplicant HAL to V4
parents 2e51481f 924020ce

compatibility_matrices/compatibility_matrix.202504.xml

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

    <hal format="aidl">

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

        <version>2-3</version>

        <version>3-4</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

wifi/supplicant/aidl/Android.bp

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



    ],

    frozen: true,

    frozen: false,

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/WpaDriverCapabilitiesMask.aidl

+1 −0
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ enum WpaDriverCapabilitiesMask { 
  TRUST_ON_FIRST_USE = (1 << 4) /* 16 */,

  SET_TLS_MINIMUM_VERSION = (1 << 5) /* 32 */,

  TLS_V1_3 = (1 << 6) /* 64 */,

  RSN_OVERRIDING = (1 << 7) /* 128 */,

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/WpaDriverCapabilitiesMask.aidl

+4 −0
Original line number Diff line number Diff line
@@ -50,4 +50,8 @@ enum WpaDriverCapabilitiesMask { 
     * TLS V1.3

     */

    TLS_V1_3 = 1 << 6,

    /**

     * RSN Overriding

     */

    RSN_OVERRIDING = 1 << 7,

}

wifi/supplicant/aidl/vts/functional/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ cc_test { 
        "android.hardware.wifi.common-V1-ndk",

        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

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

        "android.hardware.wifi.supplicant-V4-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",
@@ -84,7 +84,7 @@ cc_test { 
        "android.hardware.wifi.common-V1-ndk",

        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

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

        "android.hardware.wifi.supplicant-V4-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",
@@ -122,7 +122,7 @@ cc_test { 
        "android.hardware.wifi.common-V1-ndk",

        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

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

        "android.hardware.wifi.supplicant-V4-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",