diff --git a/api/current.txt b/api/current.txt index b017f9d2f5b94..1924d75a0ef24 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23975,11 +23975,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, 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"; diff --git a/api/removed.txt b/api/removed.txt index 35b485980276c..d006ce5c33c56 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -121,6 +121,12 @@ package android.media.tv { package android.net { + public class ConnectivityManager { + method public deprecated boolean requestRouteToHost(int, int); + method public deprecated int startUsingNetworkFeature(int, java.lang.String); + method public deprecated int stopUsingNetworkFeature(int, java.lang.String); + } + public abstract class PskKeyManager { ctor public PskKeyManager(); field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80 diff --git a/api/system-current.txt b/api/system-current.txt index a5534deebd93e..41fcecdee8123 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25767,14 +25767,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 void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback); method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler); - method public deprecated int startUsingNetworkFeature(int, java.lang.String); method public void stopTethering(int); - 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"; diff --git a/api/system-removed.txt b/api/system-removed.txt index 8016f58ccedbd..c8e1bf7693065 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -119,6 +119,12 @@ package android.media.tv { package android.net { + public class ConnectivityManager { + method public deprecated boolean requestRouteToHost(int, int); + method public deprecated int startUsingNetworkFeature(int, java.lang.String); + method public deprecated int stopUsingNetworkFeature(int, java.lang.String); + } + public abstract class PskKeyManager { ctor public PskKeyManager(); field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80 diff --git a/api/test-current.txt b/api/test-current.txt index 5db134a289646..efa9ebf9992f4 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -24062,11 +24062,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, 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"; diff --git a/api/test-removed.txt b/api/test-removed.txt index 35b485980276c..d006ce5c33c56 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -121,6 +121,12 @@ package android.media.tv { package android.net { + public class ConnectivityManager { + method public deprecated boolean requestRouteToHost(int, int); + method public deprecated int startUsingNetworkFeature(int, java.lang.String); + method public deprecated int stopUsingNetworkFeature(int, java.lang.String); + } + public abstract class PskKeyManager { ctor public PskKeyManager(); field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80 diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index d1d5f40739dba..ac0c0dc5a9166 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -1163,6 +1163,7 @@ public class ConnectivityManager { * {@link #requestNetwork(NetworkRequest, NetworkCallback)} API. * In {@link VERSION_CODES#M}, and above, this method is unsupported and will * throw {@code UnsupportedOperationException} if called. + * @removed */ @Deprecated public int startUsingNetworkFeature(int networkType, String feature) { @@ -1219,6 +1220,7 @@ public class ConnectivityManager { * {@link #unregisterNetworkCallback(NetworkCallback)} API. * In {@link VERSION_CODES#M}, and above, this method is unsupported and will * throw {@code UnsupportedOperationException} if called. + * @removed */ @Deprecated public int stopUsingNetworkFeature(int networkType, String feature) { @@ -1633,6 +1635,7 @@ public class ConnectivityManager { * {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API. * In {@link VERSION_CODES#M}, and above, this method is unsupported and will * throw {@code UnsupportedOperationException} if called. + * @removed */ @Deprecated public boolean requestRouteToHost(int networkType, int hostAddress) {