joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Robert Greenwalt 2015-07-28 19:39:48 +00:00 • committed by Android (Google) Code Review
commit f5a934b60c
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
* {@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 {