diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-06-23 14:41:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 14:41:57 +0000 |
| commit | e2d921da29e8ef556784178f2a30fad80258d034 (patch) | |
| tree | 480c8233cefd9d32d96ec05ab51d1cad40890007 /core/java/android/net | |
| parent | 805fc82ea9c12aba53af4ebda6ea3f8a349201ac (diff) | |
| parent | 662761224c93cf060a356284101354031cb80dc2 (diff) | |
| download | frameworks_base-e2d921da29e8ef556784178f2a30fad80258d034.zip frameworks_base-e2d921da29e8ef556784178f2a30fad80258d034.tar.gz frameworks_base-e2d921da29e8ef556784178f2a30fad80258d034.tar.bz2 | |
Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index b9f7365..04a29aa 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2110,6 +2110,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 cf747cf..bf94b25 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; |