summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-09-01 01:59:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-01 01:59:15 -0700
commit69697265e0238d7482aed278d9d2c4684d8808a8 (patch)
tree9c22e3e15d931394ae2cbdb21046791099768236 /core
parentfade1b005d1e46d954367500addebef233c79e2e (diff)
parentb5503c168a49f0f2b1372678f87d874e7d82aaad (diff)
downloadframeworks_base-69697265e0238d7482aed278d9d2c4684d8808a8.zip
frameworks_base-69697265e0238d7482aed278d9d2c4684d8808a8.tar.gz
frameworks_base-69697265e0238d7482aed278d9d2c4684d8808a8.tar.bz2
Merge "Fix warnings in docs generation."
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Browser.java3
-rw-r--r--core/java/android/webkit/CacheManager.java4
-rw-r--r--core/java/android/webkit/WebViewClient.java1
3 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java
index fd9d699..4422113 100644
--- a/core/java/android/provider/Browser.java
+++ b/core/java/android/provider/Browser.java
@@ -648,8 +648,7 @@ public class Browser {
*/
public static class SearchColumns implements BaseColumns {
/**
- * Not used.
- * @deprecated
+ * @deprecated Not used.
*/
@Deprecated
public static final String URL = "url";
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java
index d5058b0..52a117d 100644
--- a/core/java/android/webkit/CacheManager.java
+++ b/core/java/android/webkit/CacheManager.java
@@ -284,7 +284,7 @@ public final class CacheManager {
// only called from WebCore Thread
// make sure to call startCacheTransaction/endCacheTransaction in pair
/**
- * @deprecated
+ * @deprecated Not used
*/
@Deprecated
public static boolean startCacheTransaction() {
@@ -294,7 +294,7 @@ public final class CacheManager {
// only called from WebCore Thread
// make sure to call startCacheTransaction/endCacheTransaction in pair
/**
- * @deprecated
+ * @deprecated Not used
*/
@Deprecated
public static boolean endCacheTransaction() {
diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java
index 02c7210..1f8eeba 100644
--- a/core/java/android/webkit/WebViewClient.java
+++ b/core/java/android/webkit/WebViewClient.java
@@ -89,6 +89,7 @@ public class WebViewClient {
* @deprecated This method is no longer called. When the WebView encounters
* a redirect loop, it will cancel the load.
*/
+ @Deprecated
public void onTooManyRedirects(WebView view, Message cancelMsg,
Message continueMsg) {
cancelMsg.sendToTarget();