summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-10-27 17:24:45 -0600
committerJeff Sharkey <jsharkey@android.com>2017-10-30 12:01:44 -0600
commit1d8c2b131311fb4d8abe1c4507cfc54967f4560e (patch)
tree5d343fbb35c49678c40d6a69eced39cd2d26e3f6
parenta8d5e408d08e183896655101f4c11b0a61c48ab8 (diff)
downloadwifi-o-mr1-iot-preview-6.tar.gz
Define NOT_ROAMING network capability.android-o-mr1-iot-preview-6o-mr1-iot-preview-6
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. Bug: 68397798, 16207332 Change-Id: Id115bd88c3a83462dfececb145e9d1900ee0a8a6
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 66ab1a3cb..a8bd578c6 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -977,6 +977,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
mNetworkCapabilitiesFilter.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
mNetworkCapabilitiesFilter.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
mNetworkCapabilitiesFilter.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
+ mNetworkCapabilitiesFilter.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
mNetworkCapabilitiesFilter.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
mNetworkCapabilitiesFilter.setLinkUpstreamBandwidthKbps(1024 * 1024);
mNetworkCapabilitiesFilter.setLinkDownstreamBandwidthKbps(1024 * 1024);