Add documentation for CookieManager defualts

Documents the defualt settings of acceptCookies and acceptFileSchemeCookies.

The current defaults:
                            <L       >=L
acceptCookies           |    y   |    y   |
acceptThirdPartyCookies |    y   |    n   |
acceptFileCookies       |    n   |    n   |

Bug: 11575158
Change-Id: Ia6cb71bf80608cb2ea8049192f33616e57c15801

2 files changed, 11 insertions, 4 deletions

diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index da99dd6..7c30d2a 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -50,6 +50,12 @@ public class CookieManager {
     /**
      * Sets whether the application's {@link WebView} instances should send and
      * accept cookies.
+     * By default this is set to true and the WebView accepts cookies.
+     * <p>
+     * When this is true
+     * {@link CookieManager#setAcceptThirdPartyCookies setAcceptThirdPartyCookies} and
+     * {@link CookieManager#setAcceptFileSchemeCookies setAcceptFileSchemeCookies}
+     * can be used to control the policy for those specific types of cookie.
      *
      * @param accept whether {@link WebView} instances should send and accept
      *               cookies
@@ -291,9 +297,10 @@ public class CookieManager {
     /**
      * Sets whether the application's {@link WebView} instances should send and
      * accept cookies for file scheme URLs.
-     * Use of cookies with file scheme URLs is potentially insecure. Do not use
-     * this feature unless you can be sure that no unintentional sharing of
-     * cookie data can take place.
+     * Use of cookies with file scheme URLs is potentially insecure and turned
+     * off by default.
+     * Do not use this feature unless you can be sure that no unintentional
+     * sharing of cookie data can take place.
      * <p>
      * Note that calls to this method will have no effect if made after a
      * {@link WebView} or CookieManager instance has been created.
diff --git a/core/java/android/webkit/CookieSyncManager.java b/core/java/android/webkit/CookieSyncManager.java
index ebfa46b..1c364c0 100644
--- a/core/java/android/webkit/CookieSyncManager.java
+++ b/core/java/android/webkit/CookieSyncManager.java
@@ -24,7 +24,7 @@ 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 synchronous
+ *             method {@link CookieManager#flush} which is a synchronous
  *             replacement for {@link #sync}.
  *             <p>
  *