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

Commit 82dce776 authored by Gabriel Biren's avatar Gabriel Biren Committed by Presubmit Automerger Backend
Browse files

[automerge] Reorder the hostapd Generation enum to list 2p: fea031e8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16941789

Bug: 213475388
Change-Id: I53f2ead0b42f1594997ce6435a65dbeb942fb845
parents bce4d0d2 fea031e8

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

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ enum Generation { 
  WIFI_STANDARD_LEGACY = 0,

  WIFI_STANDARD_11N = 1,

  WIFI_STANDARD_11AC = 2,

  WIFI_STANDARD_11AX = 3,

  WIFI_STANDARD_11AD = 4,

  WIFI_STANDARD_11AD = 3,

  WIFI_STANDARD_11AX = 4,

  WIFI_STANDARD_11BE = 5,

}

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

+3 −3
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ package android.hardware.wifi.hostapd; 
 * WIFI_STANDARD_11N = [hw_mode is HOSTAPD_MODE_IEEE80211G and (HT is 1 or HT40 is 1)] or

 *                     [hw_mode is HOSTAPD_MODE_IEEE80211A and VHT is 0].

 * WIFI_STANDARD_11AC = hw_mode is HOSTAPD_MODE_IEEE80211A and VHT is 1.

 * WIFI_STANDARD_11AX = hw_mode is HOSTAPD_MODE_IEEE80211A and High Efficiency supported.

 * WIFI_STANDARD_11AD = hw_mode is HOSTAPD_MODE_IEEE80211AD.

 * WIFI_STANDARD_11AX = hw_mode is HOSTAPD_MODE_IEEE80211A and High Efficiency supported.

 * WIFI_STANDARD_11BE = hw_mode is HOSTAPD_MODE_IEEE80211A and Extreme High Throughput supported.

 */

@VintfStability
@@ -36,7 +36,7 @@ enum Generation { 
    WIFI_STANDARD_LEGACY = 0,

    WIFI_STANDARD_11N = 1,

    WIFI_STANDARD_11AC = 2,

    WIFI_STANDARD_11AX = 3,

    WIFI_STANDARD_11AD = 4,

    WIFI_STANDARD_11AD = 3,

    WIFI_STANDARD_11AX = 4,

    WIFI_STANDARD_11BE = 5,

}