commit 0a1bac889906c4b8ae335d5e1fb845eaa1f44efb
author Paul Jensen <pauljensen@google.com> Tue Jun 30 11:11:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 30 11:11:14 2015 +0000
tree 8361f46c0d41f6692bdad8cfd4d7c35bb1646bff
parent a923dbae3a12ea022d2991d72fecc2b5b3767fea
parent 3c3c6e8c40fe305a7c2f3dc97fc5aa8595064467

Merge "Don't reevaluate disconnected networks" 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 8fba98c..7f124dc 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2711,7 +2711,10 @@
         } else {
             nai = getNetworkAgentInfoForNetwork(network);
         }
-        if (nai == null) return;
+        if (nai == null || nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTING ||
+            nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTED) {
+            return;
+        }
         // Revalidate if the app report does not match our current validated state.
         if (hasConnectivity == nai.lastValidated) return;
         final int uid = Binder.getCallingUid();