LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f5a934b60c6ade4f034e3b5222adc1a1be66a9a4':
  Un-remove legacy ConnectivityManager API.
This commit is contained in:
Robert Greenwalt
2015-07-28 19:57:31 +00:00
committed by Android Git Automerger
parent 2d2a8d167e f5a934b60c
commit 91892f5524
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/ConnectivityManager.java
View File

@@ -892,7 +892,6 @@ public class ConnectivityManager {
* *
* @deprecated Deprecated in favor of the cleaner * @deprecated Deprecated in favor of the cleaner
* {@link #requestNetwork(NetworkRequest, NetworkCallback)} API. * {@link #requestNetwork(NetworkRequest, NetworkCallback)} API.
* @removed
*/ */
public int startUsingNetworkFeature(int networkType, String feature) { public int startUsingNetworkFeature(int networkType, String feature) {
NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature); NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature);
@@ -939,8 +938,7 @@ public class ConnectivityManager {
* implementation+feature combination, except that the value {@code -1} * implementation+feature combination, except that the value {@code -1}
* always indicates failure. * always indicates failure.
* *
* @deprecated Deprecated in favor of the cleaner {@link unregisterNetworkCallback} API. * @deprecated Deprecated in favor of the cleaner {@link #unregisterNetworkCallback} API.
* @removed
*/ */
public int stopUsingNetworkFeature(int networkType, String feature) { public int stopUsingNetworkFeature(int networkType, String feature) {
NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature); NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature);
@@ -1356,7 +1354,6 @@ public class ConnectivityManager {
* @deprecated Deprecated in favor of the * @deprecated Deprecated in favor of the
* {@link #requestNetwork(NetworkRequest, NetworkCallback)}, * {@link #requestNetwork(NetworkRequest, NetworkCallback)},
* {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API. * {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API.
* @removed
*/ */
public boolean requestRouteToHost(int networkType, int hostAddress) { public boolean requestRouteToHost(int networkType, int hostAddress) {
return requestRouteToHostAddress(networkType, NetworkUtils.intToInetAddress(hostAddress)); return requestRouteToHostAddress(networkType, NetworkUtils.intToInetAddress(hostAddress));
@@ -1375,7 +1372,6 @@ public class ConnectivityManager {
* @hide * @hide
* @deprecated Deprecated in favor of the {@link #requestNetwork} and * @deprecated Deprecated in favor of the {@link #requestNetwork} and
* {@link #bindProcessToNetwork} API. * {@link #bindProcessToNetwork} API.
* @removed
*/ */
public boolean requestRouteToHostAddress(int networkType, InetAddress hostAddress) { public boolean requestRouteToHostAddress(int networkType, InetAddress hostAddress) {
try { try {