commit 5cbf6276f5ccd0c8a7d3b6f979a3b2f557c5c229
author Jimmy Chen <jimmycmchen@google.com> Sun Dec 29 21:31:56 2019 +0200
committer Jimmy Chen <jimmycmchen@google.com> Wed Sep 02 10:56:56 2020 +0800
tree 75928cdbbb6b50263ca0667caf661860047d1a19
parent 1bdf1a79f4715ff52fd8c670d31d704df09f40d2

Wifi: support 60GHz (Wigig) band

Update WifiBand enum with new bands to support 60GHz band:
BAND_60GHZ - 60GHz band
BAND_24GHZ_5GHZ_6GHZ_60GHZ -
  2.4 GHz + 5 GHz (no DFS) + 6GHz + 60GHz
BAND_24GHZ_5GHZ_WITH_DFS_6GHZ_60GHZ -
  2.4 GHz + 5 GHz with DFS + 6GHz + 60GHz

Bug: 147495506
Test: atest VtsHalWifiV1_0TargetTest VtsHalWifiNanV1_0TargetTest VtsHalWifiApV1_0TargetTest \
            VtsHalWifiV1_1TargetTest \
            VtsHalWifiV1_2TargetTest VtsHalWifiNanV1_2TargetTest \
            VtsHalWifiV1_3TargetTest \
            VtsHalWifiApV1_4TargetTest VtsHalWifiNanV1_4TargetTest VtsHalWifiRttV1_4TargetTest
Change-Id: I7c7cc514b88b999cc33e9573ac65910c0c53417a

wifi/1.5/Android.bp

diff --git a/wifi/1.5/Android.bp b/wifi/1.5/Android.bp
index 4492521..5304760 100644
--- a/wifi/1.5/Android.bp
+++ b/wifi/1.5/Android.bp
@@ -4,6 +4,7 @@
     name: "android.hardware.wifi@1.5",
     root: "android.hardware",
     srcs: [
+        "types.hal",
         "IWifi.hal",
         "IWifiChip.hal",
     ],

wifi/1.5/types.hal

diff --git a/wifi/1.5/types.hal b/wifi/1.5/types.hal
new file mode 100644
index 0000000..71f0679
--- /dev/null
+++ b/wifi/1.5/types.hal
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.wifi@1.5;
+
+import @1.0::WifiBand;
+
+/**
+ * Wifi bands defined in 80211 spec.
+ */
+enum WifiBand : @1.0::WifiBand {
+    /**
+     * 60 GHz.
+     */
+    BAND_60GHZ = 16,
+    /**
+     * 2.4 GHz + 5 GHz no DFS + 6 GHz + 60 GHz.
+     */
+    BAND_24GHZ_5GHZ_6GHZ_60GHZ = 27,
+    /**
+     * 2.4 GHz + 5 GHz with DFS + 6 GHz + 60 GHz.
+     */
+    BAND_24GHZ_5GHZ_WITH_DFS_6GHZ_60GHZ = 31,
+};