From 7d7e35c61fd2665a5473e2bd23d63021a1148d2e Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Wed, 23 Sep 2020 15:52:28 -0700 Subject: Revert unit test change for the new 6GHz channelization This is to revert unit test changes for these who stick with the old pre-built wifi apex which doesn't have the change of framework/base/wifi for the new 6G channelization. Bug: 167426957 Test: atest com.android.server.wifi Change-Id: I41cdcdbab4d0a45340e9df5a4e3193727c9878c4 Merged-In: I2c9eb3d704d68b37685363c230d67758c31e17a1 --- .../src/com/android/server/wifi/util/ApConfigUtilTest.java | 6 +++--- .../com/android/server/wifi/util/InformationElementUtilTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java index df85aa996..16c915729 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java @@ -112,9 +112,9 @@ public class ApConfigUtilTest extends WifiBaseTest { 5845, SoftApConfiguration.BAND_5GHZ, 169, 5865, SoftApConfiguration.BAND_5GHZ, 173, /* Now some 6GHz channels */ - 5955, SoftApConfiguration.BAND_6GHZ, 1, - 5970, SoftApConfiguration.BAND_6GHZ, 4, - 6110, SoftApConfiguration.BAND_6GHZ, 32 + 5945, SoftApConfiguration.BAND_6GHZ, 1, + 5960, SoftApConfiguration.BAND_6GHZ, 4, + 6100, SoftApConfiguration.BAND_6GHZ, 32 }; private static final int[] EMPTY_CHANNEL_LIST = {}; diff --git a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java index 3d54e69d0..a0d1da854 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java @@ -1367,7 +1367,7 @@ public class InformationElementUtilTest extends WifiBaseTest { assertTrue(heOperation.is6GhzInfoPresent()); assertFalse(heOperation.isVhtInfoPresent()); assertEquals(ScanResult.CHANNEL_WIDTH_80MHZ, heOperation.getChannelWidth()); - assertEquals(6050, heOperation.getCenterFreq0()); + assertEquals(6040, heOperation.getCenterFreq0()); assertEquals(0, heOperation.getCenterFreq1()); } @@ -1412,8 +1412,8 @@ public class InformationElementUtilTest extends WifiBaseTest { assertTrue(heOperation.is6GhzInfoPresent()); assertFalse(heOperation.isVhtInfoPresent()); assertEquals(ScanResult.CHANNEL_WIDTH_160MHZ, heOperation.getChannelWidth()); - assertEquals(6050, heOperation.getCenterFreq0()); - assertEquals(6090, heOperation.getCenterFreq1()); + assertEquals(6040, heOperation.getCenterFreq0()); + assertEquals(6080, heOperation.getCenterFreq1()); } /** -- cgit v1.2.3