From 87d4c79ccf8c71d44d5c46b75b70fe7fc1b2ad00 Mon Sep 17 00:00:00 2001 From: Paul Jensen Date: Mon, 4 Aug 2014 10:31:36 -0400 Subject: [PATCH] Remove dead CaptivePortalTracker. Captive portals are now detected by the NetworkMonitor. Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06 --- .../java/com/android/server/ConnectivityService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index a00fbf3533..cb8d68813a 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.pm.PackageManager; 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 @@ public class ConnectivityService extends IConnectivityManager.Stub { */ 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 @@ public class ConnectivityService extends IConnectivityManager.Stub { 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) {