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

Robert Greenwalt · Android (Google) Code Review · commit 7c9f8005e20a · 2011-11-10T17:22:14.000-08:00
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
@@ -514,7 +514,9 @@ public ConnectivityService(Context context, INetworkManagementService netd,
                 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);

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,9 @@ public ConnectivityService(Context context, INetworkManagementService netd,`
`514`	`514`	`continue;`
`515`	`515`	`}`
`516`	`516`	`mCurrentLinkProperties[netType] = null;`
`517`		`- if (mNetConfigs[netType].isDefault()) mNetTrackers[netType].reconnect();`
	`517`	`+ if (mNetTrackers[netType] != null && mNetConfigs[netType].isDefault()) {`
	`518`	`+ mNetTrackers[netType].reconnect();`
	`519`	`+ }`
`518`	`520`	`}`
`519`	`521`
`520`	`522`	`IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);`