commit 9524ff39e3c5dca9c3f84ea428d628d00a12761e
author Paul Jensen <pauljensen@google.com> Thu Aug 07 02:42:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 06 21:46:55 2014 +0000
tree a42078337d106017efe5226fd8150a26b2bb21ab
parent 87d4c79ccf8c71d44d5c46b75b70fe7fc1b2ad00
parent e0fd4a850bd7ae6954ddac66789205388181aa75

Merge "Flush DNS cache when routes change." into lmp-dev

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 9ca7955..f8d8db5 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -55,7 +55,6 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
-import android.net.CaptivePortalTracker;
 import android.net.ConnectivityManager;
 import android.net.IConnectivityManager;
 import android.net.INetworkManagementEventObserver;
@@ -248,12 +247,6 @@
      */
     private NetworkStateTracker mNetTrackers[];
 
-    /*
-     * Handles captive portal check on a network.
-     * Only set if device has {@link PackageManager#FEATURE_WIFI}.
-     */
-    private CaptivePortalTracker mCaptivePortalTracker;
-
     private Context mContext;
     private int mNetworkPreference;
     private int mActiveDefaultNetwork = -1;
@@ -1444,9 +1437,6 @@
                 SAMPLE_INTERVAL_ELAPSED_REQUEST_CODE, intent, 0);
         setAlarm(DEFAULT_START_SAMPLING_INTERVAL_IN_SECONDS * 1000, mSampleIntervalElapsedIntent);
 
-        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
-            mCaptivePortalTracker = CaptivePortalTracker.makeCaptivePortalTracker(mContext, this);
-        }
         loadGlobalProxy();
 
         synchronized(this) {