From 00a2f34c9a56abb1743e298753c881e8cee8efed Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 14 May 2014 08:45:02 -0700 Subject: [PATCH] Undeprecate funcs until we're ready for api-review Fixing javadoc deprecated tags to fix a checkbuild error breaks the current/api.txt. We're not ready for the api change yet, so back out the comments. Change-Id: Ia95e394da7329c1b9e3876e589c3c2137ba18048 --- core/java/android/net/ConnectivityManager.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 5c1c2b1d9e..a414421aee 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -547,12 +547,13 @@ public class ConnectivityManager { * @param preference the network type to prefer over all others. It is * unspecified what happens to the old preferred network in the * overall ordering. - * @deprecated Functionality has been removed as it no longer makes sense, - * with many more than two networks - we'd need an array to express - * preference. Instead we use dynamic network properties of - * the networks to describe their precedence. */ public void setNetworkPreference(int preference) { + // TODO - deprecate with: + // @deprecated Functionality has been removed as it no longer makes sense, + // with many more than two networks - we'd need an array to express + // preference. Instead we use dynamic network properties of + // the networks to describe their precedence. } /** @@ -562,12 +563,13 @@ public class ConnectivityManager { * *

This method requires the caller to hold the permission * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}. - * @deprecated Functionality has been removed as it no longer makes sense, - * with many more than two networks - we'd need an array to express - * preference. Instead we use dynamic network properties of - * the networks to describe their precedence. */ public int getNetworkPreference() { + // TODO - deprecate with: + // @deprecated Functionality has been removed as it no longer makes sense, + // with many more than two networks - we'd need an array to express + // preference. Instead we use dynamic network properties of + // the networks to describe their precedence. return -1; }