commit cd797a50698c43d8daeea0b97a95cd7823d759d9
author Jeff Sharkey <jsharkey@android.com> Tue Dec 05 00:58:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 05 00:58:46 2017 +0000
tree f8aa279caf665874bc9169156a4d9376c4d30148
parent 5bc3546cf6b7b70bd46a8787e0db87e9cbb70764
parent 58330a79bb03d685601c700031b7caeb347c9967

Merge "Match network roaming state to avoid wtf()."

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index ce19a1c..e168dd8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -951,7 +951,10 @@
                         getNetworkTypeName(networkType), "");
                 info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);
                 info.setIsAvailable(true);
-                state = new NetworkState(info, new LinkProperties(), new NetworkCapabilities(),
+                final NetworkCapabilities capabilities = new NetworkCapabilities();
+                capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING,
+                        !info.isRoaming());
+                state = new NetworkState(info, new LinkProperties(), capabilities,
                         null, null, null);
             }
             filterNetworkStateForUid(state, uid, ignoreBlocked);