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 
am: 3f6d2b08ad

Change-Id: I3bf92d8c1d1b4451b1af9dcb518b352ae40cc7ca
This commit is contained in:
Remi NGUYEN VAN
2018-05-24 10:57:46 -07:00
committed by android-build-merger
parent ccd6c2cffd 3f6d2b08ad
commit 9197e8ce1d
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";
/**
* 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.
* {@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.StringNetworkSpecifier;
import android.net.UidRange;
import android.net.captiveportal.CaptivePortalProbeResult;
import android.net.metrics.IpConnectivityLog;
import android.net.util.MultinetworkPolicyTracker;
import android.os.ConditionVariable;