Run WifiWatchdogServiceThread only on wifi enable

Bug: 2508997
Change-Id: Ib79ee25fcc8e39e9a1d6c5b9ef9681bc00b6d006
This commit is contained in:
Irfan Sheriff
2010-03-11 16:37:45 -08:00
parent c0b6c60d14
commit 324ec572ab

View File

@@ -81,8 +81,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/ */
private List mNetRequestersPids[]; private List mNetRequestersPids[];
private WifiWatchdogService mWifiWatchdogService;
// priority order of the nettrackers // priority order of the nettrackers
// (excluding dynamically set mNetworkPreference) // (excluding dynamically set mNetworkPreference)
// TODO - move mNetworkTypePreference into this // TODO - move mNetworkTypePreference into this
@@ -298,11 +296,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
WifiStateTracker wst = new WifiStateTracker(context, mHandler); WifiStateTracker wst = new WifiStateTracker(context, mHandler);
WifiService wifiService = new WifiService(context, wst); WifiService wifiService = new WifiService(context, wst);
ServiceManager.addService(Context.WIFI_SERVICE, wifiService); ServiceManager.addService(Context.WIFI_SERVICE, wifiService);
wifiService.startWifi();
mNetTrackers[ConnectivityManager.TYPE_WIFI] = wst; mNetTrackers[ConnectivityManager.TYPE_WIFI] = wst;
wst.startMonitoring(); wst.startMonitoring();
// Constructing this starts it too
mWifiWatchdogService = new WifiWatchdogService(context, wst);
break; break;
case ConnectivityManager.TYPE_MOBILE: case ConnectivityManager.TYPE_MOBILE:
mNetTrackers[netType] = new MobileDataStateTracker(context, mHandler, mNetTrackers[netType] = new MobileDataStateTracker(context, mHandler,