commit 5f128f9e971b7120a776f8fafde3a0db889f847d
author Lorenzo Colitti <lorenzo@google.com> Wed May 21 16:18:53 2014 -0700
committer Lorenzo Colitti <lorenzo@google.com> Wed May 21 16:18:53 2014 -0700
tree b00746ab306e263afa4508cc78b44988726a492e
parent a3425a631c67eaa0af5d2d378f125ba22d99c3d7

Properly check return value of readIpAndProxyConfigurations

On failure, it returns an empty SparseArray, not null.

Change-Id: I5d24fdcfd24eb92657bdca674b1a417508e5af56

service/java/com/android/server/wifi/WifiConfigStore.java

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 91d5f5a..9f2373b 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -1263,7 +1263,7 @@
     private void readIpAndProxyConfigurations() {
         SparseArray<IpConfiguration> networks = super.readIpAndProxyConfigurations(ipConfigFile);
 
-        if (networks == null) {
+        if (networks.size() == 0) {
             // IpConfigStore.readIpAndProxyConfigurations has already logged an error.
             return;
         }