From b46f53270ad5630f3ec9e55ff3cc993ac801a54b Mon Sep 17 00:00:00 2001
From: Gabriel Biren <gbiren@google.com>
Date: Wed, 3 Apr 2024 16:07:19 +0000
Subject: [PATCH] Handle additional WifiBand cases in
 convertAidlWifiBandToLegacy.

Several cases related to 6 Ghz are
not currently handled.

CL is adapted from aosp/3015819
which was developed for HIDL.

Bug: 331453855
Test: m
Change-Id: Ide86ef46eb6fbe3c4dd8648230ad5bf8a8112203
---
 wifi/aidl/default/aidl_struct_util.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp
index d9e023c80e..d82450e348 100644
--- a/wifi/aidl/default/aidl_struct_util.cpp
+++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -525,6 +525,7 @@ bool convertLegacyGscanCapabilitiesToAidl(const legacy_hal::wifi_gscan_capabilit
     return true;
 }
 
+// Only use to prepare parameters for Gscan.
 legacy_hal::wifi_band convertAidlWifiBandToLegacy(WifiBand band) {
     switch (band) {
         case WifiBand::BAND_UNSPECIFIED:
@@ -541,6 +542,15 @@ legacy_hal::wifi_band convertAidlWifiBandToLegacy(WifiBand band) {
             return legacy_hal::WIFI_BAND_ABG;
         case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS:
             return legacy_hal::WIFI_BAND_ABG_WITH_DFS;
+        case WifiBand::BAND_6GHZ:
+        case WifiBand::BAND_60GHZ:
+        case WifiBand::BAND_5GHZ_6GHZ:
+        case WifiBand::BAND_24GHZ_5GHZ_6GHZ:
+        case WifiBand::BAND_24GHZ_5GHZ_6GHZ_60GHZ:
+        case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS_6GHZ:
+        case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS_6GHZ_60GHZ:
+            LOG(INFO) << "WifiBand mapping may be incorrect, since 6GHz is not supported by legacy";
+            return legacy_hal::WIFI_BAND_UNSPECIFIED;
         default:
             CHECK(false);
             return {};