diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-11-10 17:22:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-10 17:22:14 -0800 |
| commit | 7c9f8005e20af0bb741e36d8239f301371ba5f7f (patch) | |
| tree | 9c81cf50fc9378626ab1a89dee4b2a16e0aa760b /services | |
| parent | 50a66f0e9c5a85a6af4a99eb66656a69eba24572 (diff) | |
| parent | 6537b028757af736ff53a13488de4fa75aaef9a9 (diff) | |
| download | frameworks_base-7c9f8005e20af0bb741e36d8239f301371ba5f7f.zip frameworks_base-7c9f8005e20af0bb741e36d8239f301371ba5f7f.tar.gz frameworks_base-7c9f8005e20af0bb741e36d8239f301371ba5f7f.tar.bz2 | |
Merge "Fix Wimax-less build." into ics-mr1
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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); |