Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
fd62bcfdca
@@ -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) {}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user