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

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

Merge "ConnectivityManager: unhide methods with Handler argument" 

am: e940d545

Change-Id: I470d68a25e62b9493ac7cfb5887e8345968f1097
parents 921c40c0 e940d545

api/current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -23812,7 +23812,9 @@ 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 void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);

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

    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 registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

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

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

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

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

    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, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, 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 void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated void setNetworkPreference(int);

    method public deprecated void setNetworkPreference(int);

api/system-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -25599,7 +25599,9 @@ package android.net { 
    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 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);

    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 registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

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

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

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

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

    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, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, 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 void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated void setNetworkPreference(int);

    method public deprecated void setNetworkPreference(int);

api/test-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -23886,7 +23886,9 @@ 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 void registerDefaultNetworkCallback(android.net.ConnectivityManager.NetworkCallback);

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

    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 registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);

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

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

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

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

    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, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, 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 void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated void setNetworkPreference(int);

    method public deprecated void setNetworkPreference(int);

core/java/android/net/ConnectivityManager.java

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

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

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

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

     *         {@code NetworkCapabilities}.

     *         {@code NetworkCapabilities}.

     * @hide

     */

     */

    public void requestNetwork(

    public void requestNetwork(

            NetworkRequest request, NetworkCallback networkCallback, Handler handler) {

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

     * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note

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

     *                        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.

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

     *

     * @hide

     */

     */

    public void requestNetwork(NetworkRequest request, int timeoutMs,

    public void requestNetwork(NetworkRequest request, int timeoutMs,

            NetworkCallback networkCallback, Handler handler) {

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

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

     *                        networks change state.

     *                        networks change state.

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

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

     * @hide

     */

     */

    public void registerNetworkCallback(

    public void registerNetworkCallback(

            NetworkRequest request, NetworkCallback networkCallback, Handler handler) {

            NetworkRequest request, NetworkCallback networkCallback, Handler handler) {
@@ -3295,7 +3291,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.

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

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

     * @hide

     */

     */

    public void registerDefaultNetworkCallback(NetworkCallback networkCallback, Handler handler) {

    public void registerDefaultNetworkCallback(NetworkCallback networkCallback, Handler handler) {

        // This works because if the NetworkCapabilities are null,

        // This works because if the NetworkCapabilities are null,