commit 89f510319f90425bf0d3c04c753c25b77eb43c4b
author Sanket Padawe <sanketpadawe@google.com> Mon May 04 20:44:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 04 20:44:52 2015 +0000
tree 04f3ec5ebedbfb8ee3a497bc7fb9b95dfb053559
parent c5647c2edaaa3101c565cf12939179297a9dae48
parent aeb5be7c7df32e04fe8b337f75380acb4c51f96c

Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev

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 1a75b8a..8d1d124 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1141,7 +1141,13 @@
         NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);
         if (nai != null) {
             synchronized (nai) {
-                return new NetworkCapabilities(nai.networkCapabilities);
+                NetworkCapabilities nc = new NetworkCapabilities(nai.networkCapabilities);
+                if (nai.lastValidated) {
+                    nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+                } else {
+                    nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+                }
+                return nc;
             }
         }
         return null;