summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHector Dearman <hjd@google.com>2014-06-04 17:12:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-04 17:12:36 +0000
commit13d6cfb3b51c4740585cb7881f83ce789527901a (patch)
tree70130c5bfe9e490a7d78ce3ae9124a3b1b11967a
parent4806c12711412357cf5b07d85b42166097dcd61d (diff)
parent0ac81cb785241f49abc39ba639abddc33b891971 (diff)
Merge "Removes bad comment from CookieManager"
-rw-r--r--core/java/android/webkit/CookieManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index 2b75d83a8da0..abed08292041 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -70,8 +70,7 @@ public class CookieManager {
/**
* Sets a cookie for the given URL. Any existing cookie with the same host,
* path and name will be replaced with the new cookie. The cookie being set
- * must not have expired and must not be a session cookie, otherwise it
- * will be ignored.
+ * will be ignored if it is expired.
*
* @param url the URL for which the cookie is set
* @param value the cookie as a string, using the format of the 'Set-Cookie'