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

Commit ab0f3875 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am: 9639cd62 am: b293e99d 

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

Change-Id: I79ea719215b6cdfd7e418edfe975cd9207079a5e
parents cc7e711c b293e99d

core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -44,8 +44,6 @@ import com.android.bandwidthtest.NetworkState; 
import com.android.bandwidthtest.NetworkState.StateTransitionDirection;

import com.android.bandwidthtest.NetworkState.StateTransitionDirection;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.AsyncChannel;





import junit.framework.Assert;



import java.io.IOException;

import java.io.IOException;

import java.net.UnknownHostException;

import java.net.UnknownHostException;

import java.util.List;

import java.util.List;
@@ -76,7 +74,11 @@ public class ConnectionUtil { 
    private WifiManager mWifiManager;

    private WifiManager mWifiManager;

    private Context mContext;

    private Context mContext;

    // Verify connectivity state

    // Verify connectivity state

    private static final int NUM_NETWORK_TYPES = ConnectivityManager.MAX_NETWORK_TYPE + 1;

    // ConnectivityManager.TYPE_* is deprecated and no longer extended, so use the max public

    // network type - TYPE_VPN should be enough.

    // TODO: Replace registering CONNECTIVITY_ACTION with registering NetworkCallback and check

    //  network by NetworkCapabilities.TRANSPORT_* and NetworkCapabilities.hasTransport() instead.

    private static final int NUM_NETWORK_TYPES = ConnectivityManager.TYPE_VPN + 1;

    private NetworkState[] mConnectivityState = new NetworkState[NUM_NETWORK_TYPES];

    private NetworkState[] mConnectivityState = new NetworkState[NUM_NETWORK_TYPES];





    public ConnectionUtil(Context context) {

    public ConnectionUtil(Context context) {