diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2018-05-24 10:57:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-24 10:57:46 -0700 |
| commit | 20c62063b6c86d41670aeed30abb4e04460aea7e (patch) | |
| tree | 96b3251a071c5f8bdecf6dbf60126d7c9723cb57 /core/java/android/net/ConnectivityManager.java | |
| parent | 95cb9a1cb358423618fd79823207b02dccd91198 (diff) | |
| parent | 7b0935509d0d894084cda8cd1f516108433ec620 (diff) | |
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
am: 7b0935509d
Change-Id: I3bf92d8c1d1b4451b1af9dcb518b352ae40cc7ca
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 40f47b0cda27..4ccfea2efa1d 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -238,6 +238,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} */ |