Merge "Fix Wimax-less build." into ics-mr1

2011-11-10 17:22:14 -08:00
parent 50a66f0e9c 6537b02875
commit 7c9f8005e2
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -514,7 +514,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                continue;
            }
            mCurrentLinkProperties[netType] = null;
-            if (mNetConfigs[netType].isDefault()) mNetTrackers[netType].reconnect();
+            if (mNetTrackers[netType] != null && mNetConfigs[netType].isDefault()) {
+                mNetTrackers[netType].reconnect();
+            }
        }

        IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);