Remove requestRouteToHost and {start,stop}UsingNetworkFeature.

These APIs have been deprecated since L, and since M have thrown IllegalArgumentException for apps targeting M or newer. Test: API check passes. Bug: 33607472 Change-Id: Ie582cac3872be21c51e1e37d16d7cfac496ed3e4
2016-12-09 18:39:30 +09:00
parent 3c0baf0082
commit 2187df7515
7 changed files with 21 additions and 9 deletions
--- 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";
--- 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
--- 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";
--- 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
--- 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";
--- 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
--- 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) {