diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-13 10:33:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 10:33:56 -0800 |
| commit | c07094c88ddd1ce3f6fda12f7a90b76c1bfe0977 (patch) | |
| tree | 28d6750b0644a3af965645f9e522c0000f5ca346 /services | |
| parent | 41bd1e555e9020e3c1e00d3dffdfacacd5ee80f4 (diff) | |
| parent | 955b575dd94370f618f6b6424d60c1aa9dc34c14 (diff) | |
| download | frameworks_base-c07094c88ddd1ce3f6fda12f7a90b76c1bfe0977.zip frameworks_base-c07094c88ddd1ce3f6fda12f7a90b76c1bfe0977.tar.gz frameworks_base-c07094c88ddd1ce3f6fda12f7a90b76c1bfe0977.tar.bz2 | |
am 955b575d: am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '955b575dd94370f618f6b6424d60c1aa9dc34c14':
Fix NPE in ConnectivityService
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 571724d..7910147 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1568,9 +1568,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { return false; } NetworkStateTracker tracker = mNetTrackers[networkType]; - DetailedState netState = tracker.getNetworkInfo().getDetailedState(); + DetailedState netState = DetailedState.DISCONNECTED; + if (tracker != null) { + netState = tracker.getNetworkInfo().getDetailedState(); + } - if (tracker == null || (netState != DetailedState.CONNECTED && + if ((netState != DetailedState.CONNECTED && netState != DetailedState.CAPTIVE_PORTAL_CHECK) || tracker.isTeardownRequested()) { if (VDBG) { |