LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Serik Beketayev
2021-02-01 23:11:56 +00:00
committed by Gerrit Code Review
parent 9036c07442 0513030fcd
commit f3163aafec
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -216,8 +216,6 @@ import com.android.server.net.LockdownVpnTracker;
import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.net.NetworkPolicyManagerInternal;
import com.android.server.utils.PriorityDump; import com.android.server.utils.PriorityDump;
import com.google.android.collect.Lists;
import libcore.io.IoUtils; import libcore.io.IoUtils;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -1577,7 +1575,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Override @Override
public NetworkInfo[] getAllNetworkInfo() { public NetworkInfo[] getAllNetworkInfo() {
enforceAccessPermission(); enforceAccessPermission();
final ArrayList<NetworkInfo> result = Lists.newArrayList(); final ArrayList<NetworkInfo> result = new ArrayList<>();
for (int networkType = 0; networkType <= ConnectivityManager.MAX_NETWORK_TYPE; for (int networkType = 0; networkType <= ConnectivityManager.MAX_NETWORK_TYPE;
networkType++) { networkType++) {
NetworkInfo info = getNetworkInfo(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. // This contains IMSI details, so make sure the caller is privileged.
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);
final ArrayList<NetworkState> result = Lists.newArrayList(); final ArrayList<NetworkState> result = new ArrayList<>();
for (Network network : getAllNetworks()) { for (Network network : getAllNetworks()) {
final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network); final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);
if (nai != null) { if (nai != null) {