Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed NPE when wifi is turned off." into nyc-dev

Browse Source
This commit is contained in:
Felipe Leme
2016-03-09 23:03:52 +00:00
committed by Android (Google) Code Review
parent ef9716d2fd c8ce9a8235
commit 63c2151b17
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java
View File

@@ -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<NetworkPolicy> getWifiPolicies() throws RemoteException {
// First gets a list of saved wi-fi networks.
final List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
final Set<String> ssids = new HashSet<>(configs.size());
for (WifiConfiguration config : configs) {
ssids.add(removeDoubleQuotes(config.SSID));
final int size = configs != null ? configs.size() : 0;
final Set<String> ssids = new HashSet<>(size);
if (configs != null) {
for (WifiConfiguration config : configs) {
ssids.add(removeDoubleQuotes(config.SSID));
}
}
// Then gets the saved policies.