From 31c3b90be561736ba99d201e3a2d8735f0c9e9c9 Mon Sep 17 00:00:00 2001
From: Ang Li <angli@google.com>
Date: Mon, 26 Feb 2018 13:53:20 -0800
Subject: Fail `wifiConnect` if the network specified does not exist. (#92)

---
 .../google/android/mobly/snippet/bundled/WifiManagerSnippet.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main')

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 f6de71e..15f8029 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
@@ -259,7 +259,11 @@ public class WifiManagerSnippet implements Snippet {
             throw new WifiManagerSnippetException(
                     "Failed to reconnect to Wi-Fi network of ID: " + networkId);
         }
-        if (!Utils.waitUntil(() -> mWifiManager.getConnectionInfo().getSSID().equals(SSID), 90)) {
+        if (!Utils.waitUntil(
+                () ->
+                        mWifiManager.getConnectionInfo().getSSID().equals(SSID)
+                                && connectionInfo.getNetworkId() != -1,
+                90)) {
             throw new WifiManagerSnippetException(
                     "Failed to connect to Wi-Fi network "
                             + wifiNetworkConfig.toString()
-- 
cgit v1.2.3