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

Commit e51c46b0 authored by Paul Jensen's avatar Paul Jensen Committed by Android (Google) Code Review
Browse files

Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev

parents cb23ec41 f2c1cfe4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -18148,6 +18148,7 @@ package android.net { 
    method public deprecated void setNetworkPreference(int);

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

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

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

    field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";

    field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL";

    field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19663,6 +19663,7 @@ package android.net { 
    method public deprecated void setNetworkPreference(int);

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

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

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

    field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";

    field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL";

    field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";

core/java/android/net/ConnectivityManager.java

+14 −1
Original line number Diff line number Diff line
@@ -2565,7 +2565,7 @@ public class ConnectivityManager { 
     * replaced by this one, effectively releasing the previous {@link NetworkRequest}.

     * <p>

     * The request may be released normally by calling

     * {@link #releaseNetworkRequest(android.app.PendingIntent)}.

     * {@link #unregisterNetworkCallback(android.app.PendingIntent)}.

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.

     * @param request {@link NetworkRequest} describing this request.
@@ -2618,6 +2618,19 @@ public class ConnectivityManager { 
        } catch (RemoteException e) {}

    }



    /**

     * Unregisters a callback previously registered via

     * {@link #registerNetworkCallback(NetworkRequest, android.app.PendingIntent)}.

     *

     * @param operation A PendingIntent equal (as defined by {@link Intent#filterEquals}) to the

     *                  PendingIntent passed to

     *                  {@link #registerNetworkCallback(NetworkRequest, android.app.PendingIntent)}.

     *                  Cannot be null.

     */

    public void unregisterNetworkCallback(PendingIntent operation) {

        releaseNetworkRequest(operation);

    }



    /**

     * Informs the system whether it should switch to {@code network} regardless of whether it is

     * validated or not. If {@code accept} is true, and the network was explicitly selected by the