Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d700fe96 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: 63c2151b

* commit '63c2151b':
  Fixed NPE when wifi is turned off.
parents 2bdfd17a 63c2151b

services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java

+7 −3
Original line number Diff line number Diff line
@@ -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,10 +365,13 @@ 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());

        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.

        final NetworkPolicy[] policies = mInterface.getNetworkPolicies(null);