commit 67059183e18c5ed16650f6ac458c191f77e430dd
author Jimmy Chen <jimmycmchen@google.com> Tue Sep 08 16:17:58 2020 +0800
committer Jimmy Chen <jimmycmchen@google.com> Thu Sep 10 01:40:20 2020 +0000
tree 215c47786ebe6d65443f7f229740e02f031d0f59
parent 8f7b64b3c29225946360a4257c024809a63d586e

wifi: add 60GHz support to wifi tracker lib

Bug: 145337375
Test: atest FrameworksWifiTests
Change-Id: I1502fb8c168dad92a9abc57b16d77bcdd763076e

libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index 562dfb6..cafe511 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -894,7 +894,8 @@
         description.append("[");
         description.append(getScanResultDescription(MIN_FREQ_24GHZ, MAX_FREQ_24GHZ)).append(";");
         description.append(getScanResultDescription(MIN_FREQ_5GHZ, MAX_FREQ_5GHZ)).append(";");
-        description.append(getScanResultDescription(MIN_FREQ_6GHZ, MAX_FREQ_6GHZ));
+        description.append(getScanResultDescription(MIN_FREQ_6GHZ, MAX_FREQ_6GHZ)).append(";");
+        description.append(getScanResultDescription(MIN_FREQ_60GHZ, MAX_FREQ_60GHZ));
         description.append("]");
         return description.toString();
     }

libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
index ea448e9..81d3be4 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
@@ -154,6 +154,7 @@
             FREQUENCY_2_4_GHZ,
             FREQUENCY_5_GHZ,
             FREQUENCY_6_GHZ,
+            FREQUENCY_60_GHZ,
             FREQUENCY_UNKNOWN
     })
 
@@ -162,6 +163,7 @@
     public static final int FREQUENCY_2_4_GHZ = 2_400;
     public static final int FREQUENCY_5_GHZ = 5_000;
     public static final int FREQUENCY_6_GHZ = 6_000;
+    public static final int FREQUENCY_60_GHZ = 60_000;
     public static final int FREQUENCY_UNKNOWN = -1;
 
     /**
@@ -195,6 +197,16 @@
     public static final int MAX_FREQ_6GHZ = 7125;
 
     /**
+     * Min bound on the 60 GHz (802.11ad) WLAN channels.
+     */
+    public static final int MIN_FREQ_60GHZ = 58320;
+
+    /**
+     * Max bound on the 60 GHz (802.11ad) WLAN channels.
+     */
+    public static final int MAX_FREQ_60GHZ = 70200;
+
+    /**
      * Max ScanResult information displayed of Wi-Fi Verbose Logging.
      */
     protected static final int MAX_VERBOSE_LOG_DISPLAY_SCANRESULT_COUNT = 4;