diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2020-06-02 00:26:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 00:26:10 +0000 |
commit | 7b0961dc0d3f2c3f811ba9c1c725eb3a22537f59 (patch) | |
tree | bc666a6fa941674b31e19493cbeb04b3063d5330 | |
parent | 974777ebec9df1b86ad2425c8aac57ec18c11bef (diff) | |
parent | 2d4d2efadde1352cd4dac3bc8d592eb2f2da8dbc (diff) | |
download | ethernet-7b0961dc0d3f2c3f811ba9c1c725eb3a22537f59.tar.gz |
Add TRANSPORT_TEST to test ethernet interfaces am: 2d4d2efaddandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Original change: undetermined
Change-Id: Ib06f0e50415fe5eb08d9caeaab8b190cdc8374ac
-rw-r--r-- | java/com/android/server/ethernet/EthernetTracker.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/java/com/android/server/ethernet/EthernetTracker.java b/java/com/android/server/ethernet/EthernetTracker.java index d37e0c9..d7fd408 100644 --- a/java/com/android/server/ethernet/EthernetTracker.java +++ b/java/com/android/server/ethernet/EthernetTracker.java @@ -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 + "'"); } |