LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am fd62bcfd: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev

Browse Source 
* commit 'fd62bcfdca0d8cb81cc8303e2b933d1f9a84019c':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
This commit is contained in:
Lorenzo Colitti
2015-06-23 14:52:47 +00:00
committed by Android Git Automerger
parent 8d96ebcfde fd62bcfdca
commit af9f765bc0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/ConnectivityManager.java
View File

@@ -2110,6 +2110,8 @@ public class ConnectivityManager {
* can automatically log in to a captive portal without user intervention. * can automatically log in to a captive portal without user intervention.
* *
* @param network The {@link Network} of the network that is being evaluated. * @param network The {@link Network} of the network that is being evaluated.
*
* @hide
*/ */
public void onPreCheck(Network network) {} public void onPreCheck(Network network) {}

1
core/java/android/net/NetworkCapabilities.java
View File

@@ -173,7 +173,6 @@ public final class NetworkCapabilities implements Parcelable {
* Indicates that connectivity on this network was successfully validated. For example, for a * 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 * network with NET_CAPABILITY_INTERNET, it means that Internet connectivity was successfully
* detected. * detected.
* @hide
*/ */
public static final int NET_CAPABILITY_VALIDATED = 16; public static final int NET_CAPABILITY_VALIDATED = 16;