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

Commit ba1e74cd authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "ConnectivityManager: unhide methods with Handler argument" am: e940d545 am: 5c5850d2 

am: 1673f71a

Change-Id: Ic575f187803548ce15965d6fde942a5322d9e35e
parents caa3f6aa 1673f71a

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -25177,7 +25177,9 @@ package android.net { 
    method public boolean isDefaultNetworkActive();

    method public static deprecated boolean isNetworkTypeValid(int);

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

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

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

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

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

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

    method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
@@ -25186,6 +25188,8 @@ package android.net { 
    method public boolean requestBandwidthUpdate(android.net.Network);

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

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

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

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

    method public deprecated void setNetworkPreference(int);

    method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -27296,7 +27296,9 @@ package android.net { 
    method public static deprecated boolean isNetworkTypeValid(int);

    method public boolean isTetheringSupported();

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

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

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

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

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

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

    method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
@@ -27305,6 +27307,8 @@ package android.net { 
    method public boolean requestBandwidthUpdate(android.net.Network);

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

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

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

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

    method public deprecated void setNetworkPreference(int);

    method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -25278,7 +25278,9 @@ package android.net { 
    method public boolean isDefaultNetworkActive();

    method public static deprecated boolean isNetworkTypeValid(int);

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

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

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

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

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

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

    method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
@@ -25287,6 +25289,8 @@ package android.net { 
    method public boolean requestBandwidthUpdate(android.net.Network);

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

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

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

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

    method public deprecated void setNetworkPreference(int);

    method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);

core/java/android/net/ConnectivityManager.java

+0 −5
Original line number Diff line number Diff line
@@ -2985,7 +2985,6 @@ public class ConnectivityManager { 
     * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.

     * @throws IllegalArgumentException if {@code request} specifies any mutable

     *         {@code NetworkCapabilities}.

     * @hide

     */

    public void requestNetwork(

            NetworkRequest request, NetworkCallback networkCallback, Handler handler) {
@@ -3102,8 +3101,6 @@ public class ConnectivityManager { 
     * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note

     *                        the callback must not be shared - it uniquely specifies this request.

     * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.

     *

     * @hide

     */

    public void requestNetwork(NetworkRequest request, int timeoutMs,

            NetworkCallback networkCallback, Handler handler) {
@@ -3243,7 +3240,6 @@ public class ConnectivityManager { 
     * @param networkCallback The {@link NetworkCallback} that the system will call as suitable

     *                        networks change state.

     * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.

     * @hide

     */

    public void registerNetworkCallback(

            NetworkRequest request, NetworkCallback networkCallback, Handler handler) {
@@ -3317,7 +3313,6 @@ public class ConnectivityManager { 
     * @param networkCallback The {@link NetworkCallback} that the system will call as the

     *                        system default network changes.

     * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.

     * @hide

     */

    public void registerDefaultNetworkCallback(NetworkCallback networkCallback, Handler handler) {

        // This works because if the NetworkCapabilities are null,