commit cafd8583a160171b8528fb4276ce42ff932db0cd
author Robert Greenwalt <rgreenwalt@google.com> Thu Nov 10 16:55:20 2011 -0800
committer Robert Greenwalt <rgreenwalt@google.com> Thu Nov 10 17:14:05 2011 -0800
tree d83457e7cda5aa007015d0a15a9dbf87f722be96
parent 5255f307fb613008d0972721f0510091938c6bbe

Fix Wimax-less build.

A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.

bug:5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 4af6112..fc87033 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -514,7 +514,9 @@
                 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);