summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorHector Dearman <hjd@google.com>2014-07-24 23:49:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-24 23:49:21 +0000
commit28f4c20363523cfc61cdc03960dad8c12de9637a (patch)
treeef167d93e68bd1d52ca1485070d8b2f80949ded0 /api
parent23633d34ed2b41fb6da7b5d2107e6fe267bf6b9d (diff)
parent0cf22691bd0a1ab2965d84b5c2fd49de0adae153 (diff)
downloadframeworks_base-28f4c20363523cfc61cdc03960dad8c12de9637a.zip
frameworks_base-28f4c20363523cfc61cdc03960dad8c12de9637a.tar.gz
frameworks_base-28f4c20363523cfc61cdc03960dad8c12de9637a.tar.bz2
am 017d651c: am fb8f0643: am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev
* commit '017d651cdd6509676ee88d960adc3415d69bba3c': Update CookieManager API for Council review.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 9a4907a..c538fa1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36717,7 +36717,7 @@ package android.webkit {
method public void removeSessionCookies(android.webkit.ValueCallback<java.lang.Boolean>);
method public synchronized void setAcceptCookie(boolean);
method public static void setAcceptFileSchemeCookies(boolean);
- method public synchronized void setAcceptThirdPartyCookies(android.webkit.WebView, boolean);
+ method public void setAcceptThirdPartyCookies(android.webkit.WebView, boolean);
method public void setCookie(java.lang.String, java.lang.String);
method public void setCookie(java.lang.String, java.lang.String, android.webkit.ValueCallback<java.lang.Boolean>);
}