commit a897e17fdd289610865f678028480a8c0e8af3af
author Les Lee <lesl@google.com> Fri Dec 17 14:31:24 2021 +0800
committer Les Lee <lesl@google.com> Fri Dec 17 14:32:14 2021 +0800
tree 7ec2dab33404c17f9f2ed78f2e510dabbd6959e2
parent 4e86f989e783c77f86e2b019a8053b8b18d7cb8b

cts: Add cts to test new API in SoftApConfiguration

Bug: 202316146
Test: android.net.wifi.cts.WifiManagerTest#testSetGetSoftApConfigurationAndSoftApCapabilityCallback
Change-Id: Ifc15d2d333471b4236a60a4ca07a2ec1db9c6f92

tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
index 2c99668..f0d0804 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -2158,6 +2158,10 @@
                     testSoftApConfig.isBridgedModeOpportunisticShutdownEnabled());
             assertEquals(currentConfig.isIeee80211axEnabled(),
                     testSoftApConfig.isIeee80211axEnabled());
+            if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {
+                assertEquals(currentConfig.getBridgedModeOpportunisticShutdownTimeoutMillis(),
+                        testSoftApConfig.getBridgedModeOpportunisticShutdownTimeoutMillis());
+            }
         }
     }
 
@@ -2382,6 +2386,10 @@
                             callback.getCurrentSoftApCapability()).keyAt(0))
                     .setHiddenSsid(false);
 
+            if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {
+                softApConfigBuilder.setBridgedModeOpportunisticShutdownTimeoutMillis(30_000);
+            }
+
             // Test SoftApConfiguration set and get
             verifySetGetSoftApConfig(softApConfigBuilder.build());