Merge "Remove TRANSPORT_USB in NetworkCapabilitiesUtils" am: 55b816cb3f am: 8a470b08b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1765531
Change-Id: I396b3f68213f33dbce1d6ac016bb9e308ba03bbd
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index d4b1c9e..903214e 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -33,6 +33,7 @@
import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
+import static android.net.NetworkCapabilities.TRANSPORT_USB;
import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
@@ -47,12 +48,6 @@
* @hide
*/
public final class NetworkCapabilitiesUtils {
- /**
- * See android.net.NetworkCapabilities.TRANSPORT_USB
- * TODO: Use API constant when all downstream branches are S-based
- */
- public static final int TRANSPORT_USB = 8;
-
// Transports considered to classify networks in UI, in order of which transport should be
// surfaced when there are multiple transports. Transports not in this list do not have
// an ordering preference (in practice they will have a deterministic order based on the