From 2ce5ca97caf3c377311aac0c33da0248daed8e27 Mon Sep 17 00:00:00 2001 From: Ang Li Date: Tue, 9 Apr 2019 19:45:49 -0700 Subject: Fix a potentialy NPE in wifiConnect. (#109) Also improve a log line. --- .../android/mobly/snippet/bundled/WifiManagerSnippet.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (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 d848eb9..f7cd049 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 @@ -199,7 +199,11 @@ public class WifiManagerSnippet implements Snippet { * WifiManager#addNetwork(WifiConfiguration)}. */ private WifiConfiguration getExistingConfiguredNetwork(String ssid) { - for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) { + List wifiConfigs = mWifiManager.getConfiguredNetworks(); + if (wifiConfigs == null) { + return null; + } + for (WifiConfiguration config : wifiConfigs) { if (config.SSID.equals(ssid)) { return config; } @@ -262,9 +266,10 @@ public class WifiManagerSnippet implements Snippet { && mWifiManager.getConnectionInfo().getNetworkId() != -1, 90)) { throw new WifiManagerSnippetException( - "Failed to connect to Wi-Fi network " - + wifiNetworkConfig.toString() - + ", timeout!"); + String.format( + "Failed to connect to '%s', timeout! Current connection: '%s'", + wifiNetworkConfig.toString(), + mWifiManager.getConnectionInfo().getSSID())); } Log.d( "Connected to network '" -- cgit v1.2.3