commit 140517a1c7b15caf7183866f2d6d92a152b39fb0
author Robert Greenwalt <rgreenwalt@google.com> Thu Aug 21 21:02:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 21 21:02:19 2014 +0000
tree a617cda44daf64c38a5b7ac23b67c8c02472e318
parent a2d08df0a6a21b45a0fe5a3ec403433a468fd38b
parent 7d5756de8c4ad59b6fe71f061c97e4567138b29f

Merge "Change the NetworkInfo for disconnected types." into lmp-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 8914728..1005bd7 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2850,11 +2850,13 @@
         enforceConnectivityInternalPermission();
 
         if (TextUtils.isEmpty(iface)) return ConnectivityManager.TYPE_NONE;
-        for (NetworkStateTracker tracker : mNetTrackers) {
-            if (tracker != null) {
-                LinkProperties lp = tracker.getLinkProperties();
-                if (lp != null && iface.equals(lp.getInterfaceName())) {
-                    return tracker.getNetworkInfo().getType();
+
+        synchronized(mNetworkForNetId) {
+            for (int i = 0; i < mNetworkForNetId.size(); i++) {
+                NetworkAgentInfo nai = mNetworkForNetId.valueAt(i);
+                LinkProperties lp = nai.linkProperties;
+                if (lp != null && iface.equals(lp.getInterfaceName()) && nai.networkInfo != null) {
+                    return nai.networkInfo.getType();
                 }
             }
         }