LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead CaptivePortalTracker.

Browse Source 
Captive portals are now detected by the NetworkMonitor.

Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06
This commit is contained in:
Paul Jensen
2014-08-04 10:31:36 -04:00
parent 774a27f26c
commit 87d4c79ccf
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -55,7 +55,6 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.CaptivePortalTracker;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
@@ -248,12 +247,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/ */
private NetworkStateTracker mNetTrackers[]; 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 Context mContext;
private int mNetworkPreference; private int mNetworkPreference;
private int mActiveDefaultNetwork = -1; private int mActiveDefaultNetwork = -1;
@@ -1444,9 +1437,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
SAMPLE_INTERVAL_ELAPSED_REQUEST_CODE, intent, 0); SAMPLE_INTERVAL_ELAPSED_REQUEST_CODE, intent, 0);
setAlarm(DEFAULT_START_SAMPLING_INTERVAL_IN_SECONDS * 1000, mSampleIntervalElapsedIntent); setAlarm(DEFAULT_START_SAMPLING_INTERVAL_IN_SECONDS * 1000, mSampleIntervalElapsedIntent);
if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
mCaptivePortalTracker = CaptivePortalTracker.makeCaptivePortalTracker(mContext, this);
}
loadGlobalProxy(); loadGlobalProxy();
synchronized(this) { synchronized(this) {