From 95e8a235fe359714c27803aec1ea2d37757796d1 Mon Sep 17 00:00:00 2001 From: Ahmed ElArabawy Date: Thu, 5 Dec 2019 10:38:37 -0800 Subject: 6GHz: Changes for NAN This commit makes the required changes to support NAN in 6GHz band. Bug: 139354972 Test: atest com.android.server.wifi Change-Id: I1759de577210f537e971a0e56d64abfce6dfc225 --- .../src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java index 5522d1918..6c862b5f6 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java @@ -2717,12 +2717,14 @@ public class WifiAwareStateManagerTest extends WifiBaseTest { ConfigRequest configRequest2 = new ConfigRequest.Builder() .setSupport5gBand(true) // compatible + .setSupport6gBand(false) .setClusterLow(7).setClusterHigh(155) // incompatible! .setMasterPreference(0) // compatible .build(); ConfigRequest configRequest3 = new ConfigRequest.Builder() .setSupport5gBand(true) // compatible (will use true) + .setSupport6gBand(false) .setClusterLow(5).setClusterHigh(100) // identical (hence compatible) .setMasterPreference(masterPref3) // compatible (will use max) // compatible: will use min @@ -2772,6 +2774,7 @@ public class WifiAwareStateManagerTest extends WifiBaseTest { inOrder.verify(mockCallback3).onConnectSuccess(clientId3); collector.checkThat("support 5g: or", true, equalTo(crCapture.getValue().mSupport5gBand)); + collector.checkThat("support 6g: or", false, equalTo(crCapture.getValue().mSupport6gBand)); collector.checkThat("master preference: max", Math.max(masterPref1, masterPref3), equalTo(crCapture.getValue().mMasterPreference)); collector.checkThat("dw interval on 2.4: ~min", -- cgit v1.2.3