From c8ce9a8235c74d1f0416dc20a2956f4d393c330c Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 4 Mar 2016 16:11:29 -0800 Subject: [PATCH] Fixed NPE when wifi is turned off. Change-Id: If1f12cdd60677c4779fa5427a0a1a80d712149d5 --- .../server/net/NetworkPolicyManagerShellCommand.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java b/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java index a626b5b33012f..9cfb590c9234a 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java @@ -24,6 +24,7 @@ import static com.android.server.net.NetworkPolicyManagerService.TAG; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -364,9 +365,12 @@ class NetworkPolicyManagerShellCommand extends ShellCommand { private List getWifiPolicies() throws RemoteException { // First gets a list of saved wi-fi networks. final List configs = mWifiManager.getConfiguredNetworks(); - final Set ssids = new HashSet<>(configs.size()); - for (WifiConfiguration config : configs) { - ssids.add(removeDoubleQuotes(config.SSID)); + final int size = configs != null ? configs.size() : 0; + final Set ssids = new HashSet<>(size); + if (configs != null) { + for (WifiConfiguration config : configs) { + ssids.add(removeDoubleQuotes(config.SSID)); + } } // Then gets the saved policies.