From 662761224c93cf060a356284101354031cb80dc2 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 --- api/current.txt | 2 +- api/system-current.txt | 2 +- core/java/android/net/ConnectivityManager.java | 2 ++ core/java/android/net/NetworkCapabilities.java | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 803d2fdb77942..218cc2b5645fb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18209,7 +18209,6 @@ package android.net { method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties); method public void onLosing(android.net.Network, int); method public void onLost(android.net.Network); - method public void onPreCheck(android.net.Network); } public static abstract interface ConnectivityManager.OnNetworkActiveListener { @@ -18374,6 +18373,7 @@ package android.net { field public static final int NET_CAPABILITY_RCS = 8; // 0x8 field public static final int NET_CAPABILITY_SUPL = 1; // 0x1 field public static final int NET_CAPABILITY_TRUSTED = 14; // 0xe + field public static final int NET_CAPABILITY_VALIDATED = 16; // 0x10 field public static final int NET_CAPABILITY_WIFI_P2P = 6; // 0x6 field public static final int NET_CAPABILITY_XCAP = 9; // 0x9 field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2 diff --git a/api/system-current.txt b/api/system-current.txt index 72e41426943a8..b10acff2f77a1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19697,7 +19697,6 @@ package android.net { method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties); method public void onLosing(android.net.Network, int); method public void onLost(android.net.Network); - method public void onPreCheck(android.net.Network); } public static abstract interface ConnectivityManager.OnNetworkActiveListener { @@ -19862,6 +19861,7 @@ package android.net { field public static final int NET_CAPABILITY_RCS = 8; // 0x8 field public static final int NET_CAPABILITY_SUPL = 1; // 0x1 field public static final int NET_CAPABILITY_TRUSTED = 14; // 0xe + field public static final int NET_CAPABILITY_VALIDATED = 16; // 0x10 field public static final int NET_CAPABILITY_WIFI_P2P = 6; // 0x6 field public static final int NET_CAPABILITY_XCAP = 9; // 0x9 field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2 diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 3a3c47d860a1b..96bf5038f353c 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 cf747cf0379fe..bf94b25924f19 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;