diff options
author | Ang Li <angli@google.com> | 2019-04-09 19:45:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-09 19:45:49 -0700 |
commit | 2ce5ca97caf3c377311aac0c33da0248daed8e27 (patch) | |
tree | d619c2593376b57c955cb0a3b5ab4fa427ac15df /src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java | |
parent | 244d747c29066e1caf9c99693e6ad356931b231d (diff) | |
download | mobly-bundled-snippets-2ce5ca97caf3c377311aac0c33da0248daed8e27.tar.gz |
Fix a potentialy NPE in wifiConnect. (#109)
Also improve a log line.
Diffstat (limited to 'src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java')
-rw-r--r-- | src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java | 13 |
1 files changed, 9 insertions, 4 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 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<WifiConfiguration> 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 '" |