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

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

Merge "wifi: Upgrade hostapd hal version" into main

parents 9cee0213 ada47030

compatibility_matrices/compatibility_matrix.202504.xml

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

    <hal format="aidl">

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

        <version>1-2</version>

        <version>2-3</version>

        <interface>

            <name>IHostapd</name>

            <instance>default</instance>

wifi/hostapd/aidl/Android.bp

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



    ],

    frozen: true,

    frozen: false,

}

wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/BandMask.aidl

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
package android.hardware.wifi.hostapd;

@Backing(type="int") @VintfStability

enum BandMask {

  BAND_2_GHZ = 1,

  BAND_5_GHZ = 2,

  BAND_6_GHZ = 4,

  BAND_60_GHZ = 8,

  BAND_2_GHZ = (1 << 0) /* 1 */,

  BAND_5_GHZ = (1 << 1) /* 2 */,

  BAND_6_GHZ = (1 << 2) /* 4 */,

  BAND_60_GHZ = (1 << 3) /* 8 */,

}

wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/EncryptionType.aidl

+7 −7
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
package android.hardware.wifi.hostapd;

@Backing(type="int") @VintfStability

enum EncryptionType {

  NONE = 0,

  WPA = 1,

  WPA2 = 2,

  WPA3_SAE_TRANSITION = 3,

  WPA3_SAE = 4,

  WPA3_OWE_TRANSITION = 5,

  WPA3_OWE = 6,

  NONE,

  WPA,

  WPA2,

  WPA3_SAE_TRANSITION,

  WPA3_SAE,

  WPA3_OWE_TRANSITION,

  WPA3_OWE,

}

wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/Generation.aidl

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

@Backing(type="int") @VintfStability

enum Generation {

  WIFI_STANDARD_UNKNOWN = -1,

  WIFI_STANDARD_UNKNOWN = (-1) /* -1 */,

  WIFI_STANDARD_LEGACY = 0,

  WIFI_STANDARD_11N = 1,

  WIFI_STANDARD_11AC = 2,