diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-11-11 09:56:03 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-11-11 09:56:03 -0800 |
| commit | 424781e2e1a1f1447eea733ffd1dc0f8006b628e (patch) | |
| tree | 45e90ff9266fe590bdc22fd277651bd212934a94 /services | |
| parent | 1f8c621279ddb163ee3d63bf32d79955679db0c5 (diff) | |
| download | frameworks_base-424781e2e1a1f1447eea733ffd1dc0f8006b628e.zip frameworks_base-424781e2e1a1f1447eea733ffd1dc0f8006b628e.tar.gz frameworks_base-424781e2e1a1f1447eea733ffd1dc0f8006b628e.tar.bz2 | |
Fix NPE in ConnectivityService.
If it's configured with a defined network but can't create a network state tracker
for it, it would NPE and restart the framework whenever a default network
disconnects.
bug:5603268
Change-Id: I816c4f522d766e0353a713623f6635b03395b01e
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index fc87033..6e4aca7 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1597,6 +1597,7 @@ private NetworkStateTracker makeWimaxStateTracker() { if (checkType == prevNetType) continue; if (mNetConfigs[checkType] == null) continue; if (!mNetConfigs[checkType].isDefault()) continue; + if (mNetTrackers[checkType] == null) continue; // Enabling the isAvailable() optimization caused mobile to not get // selected if it was in the middle of error handling. Specifically |