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

am 18c1d830: Fix build.

Browse Source 
* commit '18c1d8301d8f544ae133198459bbf2698d80a14b':
  Fix build.
This commit is contained in:
Dianne Hackborn
2015-07-31 19:42:24 +00:00
committed by Android Git Automerger
parent 25c1e480f5 18c1d8301d
commit 34300e4bd4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -896,7 +896,7 @@ 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.
* In {@link VERSION_CODES#MNC}, and above, this method is unsupported and will * In {@link VERSION_CODES#M}, and above, this method is unsupported and will
* throw {@code UnsupportedOperationException} if called. * throw {@code UnsupportedOperationException} if called.
*/ */
public int startUsingNetworkFeature(int networkType, String feature) { public int startUsingNetworkFeature(int networkType, String feature) {
@@ -946,7 +946,7 @@ public class ConnectivityManager {
* 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.
* In {@link VERSION_CODES#MNC}, and above, this method is unsupported and will * In {@link VERSION_CODES#M}, and above, this method is unsupported and will
* throw {@code UnsupportedOperationException} if called. * throw {@code UnsupportedOperationException} if called.
*/ */
public int stopUsingNetworkFeature(int networkType, String feature) { public int stopUsingNetworkFeature(int networkType, String feature) {
@@ -1364,7 +1364,7 @@ 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.
* In {@link VERSION_CODES#MNC}, and above, this method is unsupported and will * In {@link VERSION_CODES#M}, and above, this method is unsupported and will
* throw {@code UnsupportedOperationException} if called. * throw {@code UnsupportedOperationException} if called.
*/ */
public boolean requestRouteToHost(int networkType, int hostAddress) { public boolean requestRouteToHost(int networkType, int hostAddress) {
@@ -2878,7 +2878,7 @@ public class ConnectivityManager {
return; return;
} }
unsupportedStartingFrom(VERSION_CODES.MNC); unsupportedStartingFrom(VERSION_CODES.M);
} }
/** /**