Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2d921da authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

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

parents 805fc82e 66276122

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -18207,7 +18207,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 {










@@ -18372,6 +18371,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

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -19708,7 +19708,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 {










@@ -19873,6 +19872,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

























core/java/android/net/ConnectivityManager.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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) {}

















































core/java/android/net/NetworkCapabilities.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -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;