Merge "WifiWatchdogService - disable bad connections"

This commit is contained in:
Irfan Sheriff
2011-06-25 11:20:54 -07:00
committed by Android (Google) Code Review

View File

@@ -131,8 +131,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
@@ -446,10 +444,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
wifiService.checkAndStartWifi(); wifiService.checkAndStartWifi();
mNetTrackers[ConnectivityManager.TYPE_WIFI] = wst; mNetTrackers[ConnectivityManager.TYPE_WIFI] = wst;
wst.startMonitoring(context, mHandler); wst.startMonitoring(context, mHandler);
//TODO: as part of WWS refactor, create only when needed
mWifiWatchdogService = new WifiWatchdogService(context);
break; break;
case ConnectivityManager.TYPE_MOBILE: case ConnectivityManager.TYPE_MOBILE:
mNetTrackers[netType] = new MobileDataStateTracker(netType, mNetTrackers[netType] = new MobileDataStateTracker(netType,