Use correct starting frequency for PSC
Update the PSC starting frequency according to IEEE802.11 draft 7.0
section 26.17.2.3.3.
Bug: 181912452
Test: atest com.android.server.wifi
Change-Id: I90e266512be67d14d47c7ce734cab3a59b5bbf08
diff --git a/framework/java/android/net/wifi/ScanResult.java b/framework/java/android/net/wifi/ScanResult.java
index 4d7bad2..42f4420 100644
--- a/framework/java/android/net/wifi/ScanResult.java
+++ b/framework/java/android/net/wifi/ScanResult.java
@@ -665,6 +665,18 @@
* @hide
*/
public static final int BAND_6_GHZ_END_FREQ_MHZ = 7115;
+ /**
+ * The center frequency of the first 6Ghz preferred scanning channel, as defined by
+ * IEEE802.11ax draft 7.0 section 26.17.2.3.3.
+ * @hide
+ */
+ public static final int BAND_6_GHZ_PSC_START_MHZ = 5975;
+ /**
+ * The number of MHz to increment in order to get the next 6Ghz preferred scanning channel
+ * as defined by IEEE802.11ax draft 7.0 section 26.17.2.3.3.
+ * @hide
+ */
+ public static final int BAND_6_GHZ_PSC_STEP_SIZE_MHZ = 80;
/**
* 6 GHz band operating class 136 channel 2 center frequency in MHz
diff --git a/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java b/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java
index 785e2e2..8bc8936 100644
--- a/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java
+++ b/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java
@@ -62,8 +62,6 @@
public static final int BAND_6_GHZ_MID_END_FREQ = 6875;
// 6G high includes UNII-8
public static final int BAND_6_GHZ_HIGH_END_FREQ = ScanResult.BAND_6_GHZ_END_FREQ_MHZ;
- private static final int BAND_6_GHZ_PSC_START_FREQ = ScanResult.BAND_6_GHZ_START_FREQ_MHZ;
- private static final int BAND_6_GHZ_PSC_STEP_SIZE = 80;
private WifiScanner.ChannelSpec[][] mBandsToChannels;
@@ -410,7 +408,8 @@
return;
}
for (int freq : missingChannels) {
- if ((freq - BAND_6_GHZ_PSC_START_FREQ) % BAND_6_GHZ_PSC_STEP_SIZE == 0) {
+ if ((freq - ScanResult.BAND_6_GHZ_PSC_START_MHZ)
+ % ScanResult.BAND_6_GHZ_PSC_STEP_SIZE_MHZ == 0) {
mChannels.add(freq);
mAllBands |= WIFI_BAND_6_GHZ;
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/service/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
index 57f4121..fa33e75 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
@@ -128,7 +128,7 @@
private static final String TEST_FEATURE_ID = "test.feature";
private static final String TEST_IFACE_NAME_0 = "wlan0";
private static final String TEST_IFACE_NAME_1 = "wlan1";
- private static final int TEST_PSC_CHANNEL = ScanResult.BAND_6_GHZ_START_FREQ_MHZ;
+ private static final int TEST_PSC_CHANNEL = ScanResult.BAND_6_GHZ_PSC_START_MHZ;
private static final int TEST_NON_PSC_CHANNEL = 5985;
private static final WifiScanner.ScanData PLACEHOLDER_SCAN_DATA =
new WifiScanner.ScanData(0, 0, new ScanResult[0]);
