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

Add TRANSPORT_TEST to test ethernet interfaces

Browse Source 
Because they operate on test interfaces, ethernet interfaces included
with setIncludeTestInterfaces should have TRANSPORT_TEST.

Bug: 156319532
Test: atest CaptivePortalApiTest
Change-Id: Ife3eab06432cabf3ee626de49abc31c8349b4316
This commit is contained in:
Remi NGUYEN VAN
2020-05-27 12:35:40 +09:00
parent bddcfc0c48
commit 1849ebd9c3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
service-t/src/com/android/server/ethernet/EthernetTracker.java
View File

@@ -70,6 +70,8 @@ final class EthernetTracker {
private final static String TAG = EthernetTracker.class.getSimpleName();
private final static boolean DBG = EthernetNetworkFactory.DBG;
private static final String TEST_IFACE_REGEXP = TEST_TAP_PREFIX + "\\d+";
/**
* Interface names we track. This is a product-dependent regular expression, plus,
* if setIncludeTestInterfaces is true, any test interfaces.
@@ -298,7 +300,8 @@ final class EthernetTracker {
// Try to resolve using mac address
nc = mNetworkCapabilities.get(hwAddress);
if (nc == null) {
nc = createDefaultNetworkCapabilities();
final boolean isTestIface = iface.matches(TEST_IFACE_REGEXP);
nc = createDefaultNetworkCapabilities(isTestIface);
}
}
@@ -457,15 +460,20 @@ final class EthernetTracker {
}
}
private static NetworkCapabilities createDefaultNetworkCapabilities() {
private static NetworkCapabilities createDefaultNetworkCapabilities(boolean isTestIface) {
NetworkCapabilities nc = createNetworkCapabilities(false /* clear default capabilities */);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
if (isTestIface) {
nc.addTransportType(NetworkCapabilities.TRANSPORT_TEST);
} else {
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
}
return nc;
}
@@ -610,7 +618,7 @@ final class EthernetTracker {
final String match = mContext.getResources().getString(
com.android.internal.R.string.config_ethernet_iface_regex);
mIfaceMatch = mIncludeTestInterfaces
? "(" + match + "|" + TEST_TAP_PREFIX + "\\d+)"
? "(" + match + "|" + TEST_IFACE_REGEXP + ")"
: match;
Log.d(TAG, "Interface match regexp set to '" + mIfaceMatch + "'");
}