From bc026d0ad8457cf8a2cb66bd5ec06e11c035856f Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Fri, 11 Nov 2011 09:56:03 -0800 Subject: [PATCH] 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 --- services/java/com/android/server/ConnectivityService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index fc87033757..6e4aca7788 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