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

Merge changes I3b3bcbbd,I18b3f263,I3c416c1a

Browse Source 
* changes:
  Use CaptivePortalProbeSpec method in portal app
  Add configurable captive portal probes
  Move CaptivePortalProbeResult to its own file
This commit is contained in:
Remi NGUYEN VAN
2018-05-24 07:53:00 +00:00
committed by Gerrit Code Review
parent d0d510a6e0 03d866a6a6
commit 3f6d2b08ad
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/ConnectivityManager.java
View File

@@ -237,6 +237,14 @@ public class ConnectivityManager {
*/ */
public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL"; public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";
/**
* Key for passing a {@link android.net.captiveportal.CaptivePortalProbeSpec} to the captive
* portal login activity.
* {@hide}
*/
public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC =
"android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";
/** /**
* Key for passing a user agent string to the captive portal login activity. * Key for passing a user agent string to the captive portal login activity.
* {@hide} * {@hide}

1
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -111,6 +111,7 @@ import android.net.NetworkUtils;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.StringNetworkSpecifier; import android.net.StringNetworkSpecifier;
import android.net.UidRange; import android.net.UidRange;
import android.net.captiveportal.CaptivePortalProbeResult;
import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpConnectivityLog;
import android.net.util.MultinetworkPolicyTracker; import android.net.util.MultinetworkPolicyTracker;
import android.os.ConditionVariable; import android.os.ConditionVariable;