From 0513030fcd727df042b9c730ef5d5c6d047718ff Mon Sep 17 00:00:00 2001 From: Serik Beketayev Date: Fri, 15 Jan 2021 16:47:25 -0800 Subject: [PATCH] [Mainline] Migrate com.google.android.collect pkg Bug: 177698384 Test: mma Change-Id: Ic86645f7a263a37c33443e5ec7d60961909f2cd2 --- .../core/java/com/android/server/ConnectivityService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 6b45abde74..224429c902 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -211,8 +211,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; @@ -1509,7 +1507,7 @@ public class ConnectivityService extends IConnectivityManager.Stub @Override public NetworkInfo[] getAllNetworkInfo() { enforceAccessPermission(); - final ArrayList result = Lists.newArrayList(); + final ArrayList result = new ArrayList<>(); for (int networkType = 0; networkType <= ConnectivityManager.MAX_NETWORK_TYPE; networkType++) { NetworkInfo info = getNetworkInfo(networkType); @@ -1778,7 +1776,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // This contains IMSI details, so make sure the caller is privileged. NetworkStack.checkNetworkStackPermission(mContext); - final ArrayList result = Lists.newArrayList(); + final ArrayList result = new ArrayList<>(); for (Network network : getAllNetworks()) { final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network); if (nai != null) {