diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-11-10 16:55:20 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-11-10 17:14:05 -0800 |
| commit | 6537b028757af736ff53a13488de4fa75aaef9a9 (patch) | |
| tree | 2f4b715bb29c8f29475d4d83ec2f04f919c826f7 /services | |
| parent | 785fd3685a69e5b3ef9c0958dcf4ae85f818e78d (diff) | |
| download | frameworks_base-6537b028757af736ff53a13488de4fa75aaef9a9.zip frameworks_base-6537b028757af736ff53a13488de4fa75aaef9a9.tar.gz frameworks_base-6537b028757af736ff53a13488de4fa75aaef9a9.tar.bz2 | |
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
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); |