aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/google/android/mobly/snippet
diff options
context:
space:
mode:
authortprotopopov-dev <73544592+tprotopopov-dev@users.noreply.github.com>2021-01-12 19:58:44 -0600
committerGitHub <noreply@github.com>2021-01-13 09:58:44 +0800
commit9190cc3a9d64c1067f332a4dc6daa499a8162904 (patch)
treef377a6937a7b26df45d7726589d0b6fd12ee916e /src/main/java/com/google/android/mobly/snippet
parentfe521427722eff1994aa156d846afb609c8cba64 (diff)
downloadmobly-bundled-snippets-9190cc3a9d64c1067f332a4dc6daa499a8162904.tar.gz
Additional condition to allow wifi to fully connect. (#138)
Diffstat (limited to 'src/main/java/com/google/android/mobly/snippet')
-rw-r--r--src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java
index 5158af0..cf577c3 100644
--- a/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java
+++ b/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java
@@ -43,7 +43,7 @@ import java.util.List;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-
+import android.net.wifi.SupplicantState;
/** Snippet class exposing Android APIs in WifiManager. */
public class WifiManagerSnippet implements Snippet {
private static class WifiManagerSnippetException extends Exception {
@@ -269,14 +269,15 @@ public class WifiManagerSnippet implements Snippet {
"Failed to reconnect to Wi-Fi network of ID: " + networkId);
}
if (!Utils.waitUntil(
- () ->
- mWifiManager.getConnectionInfo().getSSID().equals(SSID)
- && mWifiManager.getConnectionInfo().getNetworkId() != -1,
- 90)) {
+ () ->
+ mWifiManager.getConnectionInfo().getSSID().equals(SSID)
+ && mWifiManager.getConnectionInfo().getNetworkId() != -1 && mWifiManager
+ .getConnectionInfo().getSupplicantState().equals(SupplicantState.COMPLETED),
+ 90)) {
throw new WifiManagerSnippetException(
- String.format(
- "Failed to connect to '%s', timeout! Current connection: '%s'",
- wifiNetworkConfig, mWifiManager.getConnectionInfo().getSSID()));
+ String.format(
+ "Failed to connect to '%s', timeout! Current connection: '%s'",
+ wifiNetworkConfig, mWifiManager.getConnectionInfo().getSSID()));
}
Log.d(
"Connected to network '"