commit 1983079b8718dcc4cb3901cacdfd9635f3f32810
author xshu <xshu@google.com> Thu Mar 24 18:20:27 2022 -0700
committer xshu <xshu@google.com> Thu Mar 24 18:20:27 2022 -0700
tree 5ee6fe11938233443684b65a8936bc11f2f59ad8
parent d26a08e60fdbebeb4e185ccd104ebad9faa0dbfc

Use longer connection wait time for PNO scan

This is needed since after pa/2155310 PNO scan may get delayed.

Bug: 222096199
Test: atest WifiManagerTest#testPnoScan
Change-Id: I1baeaa184ba8f9679fb11f610d2d3a889cdc795b

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 b6fd50a..506abbd 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -177,6 +177,7 @@
     private static final int SCAN_TEST_WAIT_DURATION_MS = 15_000;
     private static final int TEST_WAIT_DURATION_MS = 10_000;
     private static final int WIFI_CONNECT_TIMEOUT_MILLIS = 30_000;
+    private static final int WIFI_PNO_CONNECT_TIMEOUT_MILLIS = 60_000;
     private static final int WAIT_MSEC = 60;
     private static final int DURATION_SCREEN_TOGGLE = 2000;
     private static final int DURATION_SETTINGS_TOGGLE = 1_000;
@@ -461,6 +462,10 @@
         }
     }
 
+    private void waitForConnection(int timeoutMillis) throws Exception {
+        waitForNetworkInfoState(NetworkInfo.State.CONNECTED, timeoutMillis);
+    }
+
     private void waitForConnection() throws Exception {
         waitForNetworkInfoState(NetworkInfo.State.CONNECTED, WIFI_CONNECT_TIMEOUT_MILLIS);
     }
@@ -3427,7 +3432,7 @@
         }
 
         // make sure we're connected
-        waitForConnection();
+        waitForConnection(WIFI_PNO_CONNECT_TIMEOUT_MILLIS);
 
         WifiInfo currentNetwork = ShellIdentityUtils.invokeWithShellPermissions(
                 mWifiManager::getConnectionInfo);