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

CW on Master: Disable CaptivePortalTracker, EthernetService

Browse Source 
BUG: 15143878

Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24
This commit is contained in:
Joe LaPenna
2014-07-04 17:15:54 -07:00
committed by Robert Greenwalt
parent b2a03d1782
commit 06ec2bb20d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/
private NetworkStateTracker mNetTrackers[];
/* Handles captive portal check on a network */
/*
* Handles captive portal check on a network.
* Only set if device has {@link PackageManager#FEATURE_WIFI}.
*/
private CaptivePortalTracker mCaptivePortalTracker;
/**
@@ -2337,7 +2340,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
void systemReady() {
mCaptivePortalTracker = CaptivePortalTracker.makeCaptivePortalTracker(mContext, this);
if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
mCaptivePortalTracker = CaptivePortalTracker.makeCaptivePortalTracker(mContext, this);
}
loadGlobalProxy();
synchronized(this) {