summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2015-07-31 19:42:24 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-31 19:42:24 +0000
commite8d3b39467e139ae380f2821ab91aad6031f1410 (patch)
tree4b735c78495daa589df1827cb5b1d3617faaccc2
parent9b36f526dd0378bda8f71c0e51ed37bf97742f8f (diff)
parent692a244bffea11157c37c8de93482cb912599b98 (diff)
am 692a244b: Fix build.
* commit '692a244bffea11157c37c8de93482cb912599b98': Fix build.
-rw-r--r--core/java/android/net/ConnectivityManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index a82640f5fdc6..10373cf5a97c 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -896,7 +896,7 @@ public class ConnectivityManager {
*
* @deprecated Deprecated in favor of the cleaner
* {@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.
*/
public int startUsingNetworkFeature(int networkType, String feature) {
@@ -946,7 +946,7 @@ public class ConnectivityManager {
* always indicates failure.
*
* @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.
*/
public int stopUsingNetworkFeature(int networkType, String feature) {
@@ -1364,7 +1364,7 @@ public class ConnectivityManager {
* @deprecated Deprecated in favor of the
* {@link #requestNetwork(NetworkRequest, NetworkCallback)},
* {@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.
*/
public boolean requestRouteToHost(int networkType, int hostAddress) {
@@ -2878,7 +2878,7 @@ public class ConnectivityManager {
return;
}
- unsupportedStartingFrom(VERSION_CODES.MNC);
+ unsupportedStartingFrom(VERSION_CODES.M);
}
/**