From 324ec572ab2f0e1b098b1b8c7a9c1b360572b873 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Thu, 11 Mar 2010 16:37:45 -0800 Subject: [PATCH] Run WifiWatchdogServiceThread only on wifi enable Bug: 2508997 Change-Id: Ib79ee25fcc8e39e9a1d6c5b9ef9681bc00b6d006 --- services/java/com/android/server/ConnectivityService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index fc20d96923..81b8d40b0a 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -81,8 +81,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { */ private List mNetRequestersPids[]; - private WifiWatchdogService mWifiWatchdogService; - // priority order of the nettrackers // (excluding dynamically set mNetworkPreference) // TODO - move mNetworkTypePreference into this @@ -298,11 +296,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { WifiStateTracker wst = new WifiStateTracker(context, mHandler); WifiService wifiService = new WifiService(context, wst); ServiceManager.addService(Context.WIFI_SERVICE, wifiService); + wifiService.startWifi(); mNetTrackers[ConnectivityManager.TYPE_WIFI] = wst; wst.startMonitoring(); - // Constructing this starts it too - mWifiWatchdogService = new WifiWatchdogService(context, wst); break; case ConnectivityManager.TYPE_MOBILE: mNetTrackers[netType] = new MobileDataStateTracker(context, mHandler,