From 24f7e61a3859c37deee97c3e1d19a0903a6b2b2c Mon Sep 17 00:00:00 2001 From: Hector Dearman Date: Tue, 5 Aug 2014 10:55:30 +0100 Subject: [PATCH] Fix CookieSyncManager package summary Putting the deprecated at the beginning of a class comment seems to cause problems with JavaDoc so I've moved it to the end. Bug: 16799480 Change-Id: Ia23dab2ad8ceb8e107e047480b5cb324d11a1457 --- core/java/android/webkit/CookieSyncManager.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/java/android/webkit/CookieSyncManager.java b/core/java/android/webkit/CookieSyncManager.java index 1c364c09346de..d9546ca0e7b71 100644 --- a/core/java/android/webkit/CookieSyncManager.java +++ b/core/java/android/webkit/CookieSyncManager.java @@ -21,13 +21,6 @@ import android.util.Log; /** - * @deprecated The WebView now automatically syncs cookies as necessary. - * You no longer need to create or use the CookieSyncManager. - * To manually force a sync you can use the CookieManager - * method {@link CookieManager#flush} which is a synchronous - * replacement for {@link #sync}. - *

- * * The CookieSyncManager is used to synchronize the browser cookie store * between RAM and permanent storage. To get the best performance, browser cookies are * saved in RAM. A separate thread saves the cookies between, driven by a timer. @@ -61,6 +54,12 @@ import android.util.Log; * WebViewClient#onPageFinished}. Note that even sync() happens * asynchronously, so don't do it just as your activity is shutting * down. + * + * @deprecated The WebView now automatically syncs cookies as necessary. + * You no longer need to create or use the CookieSyncManager. + * To manually force a sync you can use the CookieManager + * method {@link CookieManager#flush} which is a synchronous + * replacement for {@link #sync}. */ @Deprecated public final class CookieSyncManager extends WebSyncManager {