From 3a9df1a8cd91594f2a2c323746be794ff08518fc Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 11 Jun 2015 14:27:17 +0900 Subject: [PATCH] Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED. The API review comments in http://b/21343774 point out that the suggested use case for onPreCheck (captive portal login apps) is not a good use case as it requires that the app always be running. Also, unhide NET_CAPABILITY_VALIDATED, which is useful to apps that want to detect captive portals and network connectivity failures. Bug: 21343774 Change-Id: Iad7c839bcc136b0fa9581dccc5fd97a28efed4ab --- core/java/android/net/ConnectivityManager.java | 2 ++ core/java/android/net/NetworkCapabilities.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 3a3c47d860..96bf5038f3 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2162,6 +2162,8 @@ public class ConnectivityManager { * can automatically log in to a captive portal without user intervention. * * @param network The {@link Network} of the network that is being evaluated. + * + * @hide */ public void onPreCheck(Network network) {} diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index cf747cf037..bf94b25924 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -173,7 +173,6 @@ public final class NetworkCapabilities implements Parcelable { * Indicates that connectivity on this network was successfully validated. For example, for a * network with NET_CAPABILITY_INTERNET, it means that Internet connectivity was successfully * detected. - * @hide */ public static final int NET_CAPABILITY_VALIDATED = 16;