From fea031e81d9577a9efcd8d8390842ec3d7f97d0d Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Wed, 16 Feb 2022 20:43:52 +0000 Subject: [PATCH] Reorder the hostapd Generation enum to list the WiFi generations chronologically. Bug: 213475388 Test: Build the interface (mm -j) Change-Id: I9f501c021956a376c03884dadade473ab0953bd3 (cherry picked from commit 04deb64be1cb1fdc4242babf6eddb240d16bfd39) --- .../current/android/hardware/wifi/hostapd/Generation.aidl | 4 ++-- .../aidl/android/hardware/wifi/hostapd/Generation.aidl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/Generation.aidl b/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/Generation.aidl index af0e960df8..5bb0d32869 100644 --- a/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/Generation.aidl +++ b/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/Generation.aidl @@ -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, } diff --git a/wifi/hostapd/aidl/android/hardware/wifi/hostapd/Generation.aidl b/wifi/hostapd/aidl/android/hardware/wifi/hostapd/Generation.aidl index f4e3eb0668..5b74732bda 100644 --- a/wifi/hostapd/aidl/android/hardware/wifi/hostapd/Generation.aidl +++ b/wifi/hostapd/aidl/android/hardware/wifi/hostapd/Generation.aidl @@ -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, }