commit 5f948c9bc10aaf554fade0376eca88c15831bbc1
author Jeff Sharkey <jsharkey@android.com> Tue Dec 05 01:11:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 05 01:11:53 2017 +0000
tree 6debce847173c09c02afde241337ab397a063a1d
parent 56eeb80dc5fb6deb75f744d2a5254d4c014bb045
parent cd797a50698c43d8daeea0b97a95cd7823d759d9

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

Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515

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 954c2b2..5228498 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -949,7 +949,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);