diff options
| author | 2012-08-15 04:15:07 -0700 | |
|---|---|---|
| committer | 2012-08-15 04:15:08 -0700 | |
| commit | 65dfac3bb5e1da2b4b84724cb7e39b47957ece4c (patch) | |
| tree | 791487303428ed983cc8f06702a00370fcf06736 | |
| parent | f8d9e2fccdd9f2addeda852ad168eeb67a5f6626 (diff) | |
| parent | c723e35336e764a1e708f1a4a8ee3f7bff711c0f (diff) | |
Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev
| -rw-r--r-- | core/java/android/webkit/CookieManager.java | 4 | ||||
| -rw-r--r-- | 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 30c713e814c0..2b75d83a8da0 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 63a79e46706d..a5420bbe7ba7 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.—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 |