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

Commit 49979a37 authored by Paul Jensen's avatar Paul Jensen Committed by Android Git Automerger
Browse files

am 3ce689a4: am 356a2612: Merge "Deprecate... 

am 3ce689a4: am 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev

* commit '3ce689a4':
  Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
parents ec61c03b 3ce689a4

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -18093,7 +18093,7 @@ package android.net { 
    method public void ignoreNetworkWithCaptivePortal(android.net.Network, java.lang.String);

    method public boolean isActiveNetworkMetered();

    method public boolean isDefaultNetworkActive();

    method public static boolean isNetworkTypeValid(int);

    method public static deprecated boolean isNetworkTypeValid(int);

    method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void releaseNetworkRequest(android.app.PendingIntent);

    method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19570,7 +19570,7 @@ package android.net { 
    method public void ignoreNetworkWithCaptivePortal(android.net.Network, java.lang.String);

    method public boolean isActiveNetworkMetered();

    method public boolean isDefaultNetworkActive();

    method public static boolean isNetworkTypeValid(int);

    method public static deprecated boolean isNetworkTypeValid(int);

    method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void releaseNetworkRequest(android.app.PendingIntent);

    method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);

core/java/android/net/ConnectivityManager.java

+2 −0
Original line number Diff line number Diff line
@@ -496,6 +496,8 @@ public class ConnectivityManager { 
     * Tests if a given integer represents a valid network type.

     * @param networkType the type to be tested

     * @return a boolean.  {@code true} if the type is valid, else {@code false}

     * @deprecated All APIs accepting a network type are deprecated. There should be no need to

     *             validate a network type.

     */

    public static boolean isNetworkTypeValid(int networkType) {

        return networkType >= 0 && networkType <= MAX_NETWORK_TYPE;