commit e7bfeb3d77d1bd43fad1a23964f29b8cbf24cef1
author Irfan Sheriff <isheriff@google.com> Sat Jun 25 11:20:54 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 25 11:20:54 2011 -0700
tree aac552d76fdd7af74289509e3bae62059c4132a1
parent 968330fae86439170566f859c57703e89f91e640
parent 5cdb9c934c0057e7b7e59a66be90c88a2ceab89c

Merge "WifiWatchdogService - disable bad connections"

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 9ba9002..8ac8f2b 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -131,8 +131,6 @@
      */
     private List mNetRequestersPids[];
 
-    private WifiWatchdogService mWifiWatchdogService;
-
     // priority order of the nettrackers
     // (excluding dynamically set mNetworkPreference)
     // TODO - move mNetworkTypePreference into this
@@ -446,10 +444,6 @@
                 wifiService.checkAndStartWifi();
                 mNetTrackers[ConnectivityManager.TYPE_WIFI] = wst;
                 wst.startMonitoring(context, mHandler);
-
-                //TODO: as part of WWS refactor, create only when needed
-                mWifiWatchdogService = new WifiWatchdogService(context);
-
                 break;
             case ConnectivityManager.TYPE_MOBILE:
                 mNetTrackers[netType] = new MobileDataStateTracker(netType,