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

Commit a577a3a2 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev 

am: 36712853

* commit '36712853':
  Make public the registerDefaultNetworkCallback API

Change-Id: I35035f991a45ec700530a83cc9cc89145ebb0bb6
parents e2a06f2f 36712853

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -23452,6 +23452,7 @@ package android.net { 
    method public boolean isActiveNetworkMetered();

    method public boolean isActiveNetworkMetered();

    method public boolean isDefaultNetworkActive();

    method public boolean isDefaultNetworkActive();

    method public static deprecated boolean isNetworkTypeValid(int);

    method public static deprecated boolean isNetworkTypeValid(int);

    method public void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);

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

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

    method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

    method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

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

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

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -25188,6 +25188,7 @@ package android.net { 
    method public boolean isDefaultNetworkActive();

    method public boolean isDefaultNetworkActive();

    method public static deprecated boolean isNetworkTypeValid(int);

    method public static deprecated boolean isNetworkTypeValid(int);

    method public boolean isTetheringSupported();

    method public boolean isTetheringSupported();

    method public void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);

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

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

    method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

    method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

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

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

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -23517,6 +23517,7 @@ package android.net { 
    method public boolean isActiveNetworkMetered();

    method public boolean isActiveNetworkMetered();

    method public boolean isDefaultNetworkActive();

    method public boolean isDefaultNetworkActive();

    method public static deprecated boolean isNetworkTypeValid(int);

    method public static deprecated boolean isNetworkTypeValid(int);

    method public void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);

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

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

    method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

    method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

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

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

core/java/android/net/ConnectivityManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -3021,7 +3021,6 @@ public class ConnectivityManager { 
     *

     *

     * @param networkCallback The {@link NetworkCallback} that the system will call as the

     * @param networkCallback The {@link NetworkCallback} that the system will call as the

     *                        system default network changes.

     *                        system default network changes.

     * @hide

     */

     */

    public void registerDefaultNetworkCallback(NetworkCallback networkCallback) {

    public void registerDefaultNetworkCallback(NetworkCallback networkCallback) {

        // This works because if the NetworkCapabilities are null,

        // This works because if the NetworkCapabilities are null,