commit 9fec22bd0f666a5e96ab081ec7cd8f0369b3e9ce
author Jeff Sharkey <jsharkey@android.com> Fri Nov 03 23:07:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 03 23:07:16 2017 +0000
tree e45bf40318808b7ce83e3536c7e351d1021dc635
parent fe96fc644618f1e81d8283cfe15342be2eeb514f
parent 091e23fb0c93886b83335fac9596330a4ae06804

Define NOT_ROAMING network capability. am: 1d8c2b1313
am: 091e23fb0c

Change-Id: Ie568412643dc6f84ac67a1ff69945f7a796ca6e7

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 7001a2c..ff3aea9 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -979,6 +979,7 @@
         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);