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

Commit 82e4d363 authored by Serik Beketayev's avatar Serik Beketayev Committed by Automerger Merge Worker
Browse files

Merge "[Mainline] Migrate com.google.android.collect pkg" am: b9c6a747 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1648cf0bc1803d59787edb8715b0abc63728cc5d
parents 3504c8c7 b9c6a747

services/core/java/com/android/server/ConnectivityService.java

+2 −4
Original line number Diff line number Diff line
@@ -216,8 +216,6 @@ import com.android.server.net.LockdownVpnTracker; 
import com.android.server.net.NetworkPolicyManagerInternal;

import com.android.server.utils.PriorityDump;



import com.google.android.collect.Lists;



import libcore.io.IoUtils;



import java.io.FileDescriptor;
@@ -1577,7 +1575,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @Override

    public NetworkInfo[] getAllNetworkInfo() {

        enforceAccessPermission();

        final ArrayList<NetworkInfo> result = Lists.newArrayList();

        final ArrayList<NetworkInfo> result = new ArrayList<>();

        for (int networkType = 0; networkType <= ConnectivityManager.MAX_NETWORK_TYPE;

                networkType++) {

            NetworkInfo info = getNetworkInfo(networkType);
@@ -1851,7 +1849,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // This contains IMSI details, so make sure the caller is privileged.

        NetworkStack.checkNetworkStackPermission(mContext);



        final ArrayList<NetworkState> result = Lists.newArrayList();

        final ArrayList<NetworkState> result = new ArrayList<>();

        for (Network network : getAllNetworks()) {

            final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);

            if (nai != null) {