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

Commit b3c93c5f authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Un-remove legacy ConnectivityManager API." into mnc-dev

parents 35066219 a36c0740

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -18147,8 +18147,11 @@ 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, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated void setNetworkPreference(int);

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

    method public deprecated int startUsingNetworkFeature(int, java.lang.String);

    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);

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

api/removed.txt

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ package android.media { 


package android.net {



  public class ConnectivityManager {

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated boolean requestRouteToHostAddress(int, java.net.InetAddress);

    method public deprecated int startUsingNetworkFeature(int, java.lang.String);

    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);

  }



  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

  }

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -19660,8 +19660,11 @@ 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, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated void setNetworkPreference(int);

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

    method public deprecated int startUsingNetworkFeature(int, java.lang.String);

    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);

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

api/system-removed.txt

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ package android.media { 


package android.net {



  public class ConnectivityManager {

    method public deprecated boolean requestRouteToHost(int, int);

    method public deprecated boolean requestRouteToHostAddress(int, java.net.InetAddress);

    method public deprecated int startUsingNetworkFeature(int, java.lang.String);

    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);

  }



  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

  }

core/java/android/net/ConnectivityManager.java

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

     * @deprecated Deprecated in favor of the cleaner

     *             {@link #requestNetwork(NetworkRequest, NetworkCallback)} API.

     * @removed

     */

    public int startUsingNetworkFeature(int networkType, String feature) {

        NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature);
@@ -939,8 +938,7 @@ public class ConnectivityManager { 
     * implementation+feature combination, except that the value {@code -1}

     * always indicates failure.

     *

     * @deprecated Deprecated in favor of the cleaner {@link unregisterNetworkCallback} API.

     * @removed

     * @deprecated Deprecated in favor of the cleaner {@link #unregisterNetworkCallback} API.

     */

    public int stopUsingNetworkFeature(int networkType, String feature) {

        NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature);
@@ -1220,7 +1218,6 @@ public class ConnectivityManager { 
     * @deprecated Deprecated in favor of the

     *             {@link #requestNetwork(NetworkRequest, NetworkCallback)},

     *             {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API.

     * @removed

     */

    public boolean requestRouteToHost(int networkType, int hostAddress) {

        return requestRouteToHostAddress(networkType, NetworkUtils.intToInetAddress(hostAddress));
@@ -1239,7 +1236,6 @@ public class ConnectivityManager { 
     * @hide

     * @deprecated Deprecated in favor of the {@link #requestNetwork} and

     *             {@link #bindProcessToNetwork} API.

     * @removed

     */

    public boolean requestRouteToHostAddress(int networkType, InetAddress hostAddress) {

        try {