diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-28 11:41:31 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-28 11:41:31 -0700 |
| commit | a36c07405280f93a11ad6398553da274e6daad83 (patch) | |
| tree | 17c89314310e39859073f778e883ecb8534f8558 /api | |
| parent | e827c2525a6b76c130d2b877fbcdcf62b0ce42eb (diff) | |
| download | frameworks_base-a36c07405280f93a11ad6398553da274e6daad83.zip frameworks_base-a36c07405280f93a11ad6398553da274e6daad83.tar.gz frameworks_base-a36c07405280f93a11ad6398553da274e6daad83.tar.bz2 | |
Un-remove legacy ConnectivityManager API.
These were @removed too soon. We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.
bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/removed.txt | 7 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/system-removed.txt | 7 |
4 files changed, 6 insertions, 14 deletions
diff --git a/api/current.txt b/api/current.txt index 16c1880..1cee923 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/removed.txt b/api/removed.txt index 6d88cb6..642d2a8 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -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); } diff --git a/api/system-current.txt b/api/system-current.txt index 7c473a9..8c44cfb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/api/system-removed.txt b/api/system-removed.txt index 6d88cb6..642d2a8 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -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); } |