From c723e35336e764a1e708f1a4a8ee3f7bff711c0f Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 14 Aug 2012 14:48:05 +0100
Subject: [PATCH] Clean up JavaDoc for CookieManager

Bug: 5461416
Change-Id: I0ae09943007cf3866daad97a76f5008e61c471ed
---
 core/java/android/webkit/CookieManager.java | 4 ++--
 core/java/android/webkit/WebView.java       | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index 30c713e814c0b..2b75d83a8da08 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -37,8 +37,8 @@ public class CookieManager {
     /**
      * Gets the singleton CookieManager instance. If this method is used
      * before the application instantiates a {@link WebView} instance,
-     * {@link CookieSyncManager#createInstance(Context)} must be called
-     * first.
+     * {@link CookieSyncManager#createInstance CookieSyncManager.createInstance(Context)}
+     * must be called first.
      *
      * @return the singleton CookieManager instance
      */
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 63a79e46706d0..a5420bbe7ba7a 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -164,10 +164,7 @@ import java.util.Map;
  *
  * <p>For obvious security reasons, your application has its own
  * cache, cookie store etc.&mdash;it does not share the Browser
- * application's data. Cookies are managed on a separate thread, so
- * operations like index building don't block the UI
- * thread. Follow the instructions in {@link android.webkit.CookieSyncManager}
- * if you want to use cookies in your application.
+ * application's data.
  * </p>
  *
  * <p>By default, requests by the HTML to open new windows are