From 30b747ef956aca1481bdc46562bd6dc8934aa2d1 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 27 Oct 2017 17:56:52 -0600 Subject: [PATCH] Define NOT_ROAMING network capability. The "roaming" state of a network really belongs on NetworkCapabilities instead of being published through NetworkInfo.isRoaming(). One major reason is to support developers creating NetworkRequests for a non-roaming network. Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity. Bug: 68397798, 16207332 Change-Id: I0722d7b38d0478de3834b869552f48403af9d553 --- .../src/com/android/server/ethernet/EthernetNetworkFactory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java index 2d54fd20e4..0bbe3b5e3c 100644 --- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java @@ -427,6 +427,8 @@ class EthernetNetworkFactory { mNetworkCapabilities = new NetworkCapabilities(); mNetworkCapabilities.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET); mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); + mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); + mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); // We have no useful data on bandwidth. Say 100M up and 100M down. :-( mNetworkCapabilities.setLinkUpstreamBandwidthKbps(100 * 1000);