summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorHector Dearman <hjd@google.com>2014-07-24 23:33:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-24 23:33:41 +0000
commit0cf22691bd0a1ab2965d84b5c2fd49de0adae153 (patch)
tree4194d1ce1b9e602d5d84db2297aaa95cc3cf978f /api
parente6be6fada5ce8ae4a852b8f699efd11646804a42 (diff)
parent7bda3995fa46e11213ca6b7bc7af587be2121e90 (diff)
downloadframeworks_base-0cf22691bd0a1ab2965d84b5c2fd49de0adae153.zip
frameworks_base-0cf22691bd0a1ab2965d84b5c2fd49de0adae153.tar.gz
frameworks_base-0cf22691bd0a1ab2965d84b5c2fd49de0adae153.tar.bz2
am fb8f0643: am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev
* commit 'fb8f0643434630be607abea3ac4e9f7558311b99': 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 0657a74..854a9cf 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36713,7 +36713,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>);
}