Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace MAX_NETWORK_TYPE with TYPE_VPN

Browse Source 
ConnectivityManager#MAX_NETWORK_TYPE is a hidden API which cannot
be accessed after ConnectivityManager becomes a part of mainline
module.
Use the max public network type - TYPE_VPN should be enough since
TYPE_* is deprecated and no longer extended.

Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
      2. cd frameworks/base/core/tests/bandwidthtests; mm
Change-Id: I27579a942a0424db647ad1f3383db78d5a0c69a9
This commit is contained in:
lucaslin
2021-04-07 20:32:39 +08:00
parent f7923a9cc2
commit afdb65906d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {