commit c0e2e5715be659a19a091b37accef72939cc0dfd
author Irfan Sheriff <isheriff@google.com> Mon Jul 23 09:28:23 2012 -0700
committer Irfan Sheriff <isheriff@google.com> Mon Jul 23 10:19:34 2012 -0700
tree dc0d6ea0fc2784b87f8581802fc2d7fc40b8e19c
parent 30199405c3b15a0dc6778e7465499a7d33f7556c

Fix NPE in CTS test

wifiConfigurations returned by getConfiguredNetworks() can be null.
It is only incidental that this test passed fine in the past.

Bug: 6822950
Change-Id: I570ab6e7fd6cc5eb150914a5d7ca527ccc2f16cd

tests/cts/net/src/android/net/wifi/cts/WifiConfigurationTest.java

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiConfigurationTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiConfigurationTest.java
index 92a55b2..4480a24 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiConfigurationTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiConfigurationTest.java
@@ -38,10 +38,12 @@
             return;
         }
         List<WifiConfiguration> wifiConfigurations = mWifiManager.getConfiguredNetworks();
-        for (int i = 0; i < wifiConfigurations.size(); i++) {
-            WifiConfiguration wifiConfiguration = wifiConfigurations.get(i);
-            assertNotNull(wifiConfiguration);
-            assertNotNull(wifiConfiguration.toString());
+        if (wifiConfigurations != null) {
+            for (int i = 0; i < wifiConfigurations.size(); i++) {
+                WifiConfiguration wifiConfiguration = wifiConfigurations.get(i);
+                assertNotNull(wifiConfiguration);
+                assertNotNull(wifiConfiguration.toString());
+            }
         }
     }
 }