diff options
| author | Hector Dearman <hjd@google.com> | 2014-07-24 23:49:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 23:49:21 +0000 |
| commit | 28f4c20363523cfc61cdc03960dad8c12de9637a (patch) | |
| tree | ef167d93e68bd1d52ca1485070d8b2f80949ded0 | |
| parent | 23633d34ed2b41fb6da7b5d2107e6fe267bf6b9d (diff) | |
| parent | 0cf22691bd0a1ab2965d84b5c2fd49de0adae153 (diff) | |
| download | frameworks_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.
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/CookieManager.java | 3 |
2 files changed, 2 insertions, 3 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>); } diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index e1a7ba2..da99dd6 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -82,8 +82,7 @@ public class CookieManager { * @param accept whether the {@link WebView} instance should accept * third party cookies */ - public synchronized void setAcceptThirdPartyCookies(WebView webview, - boolean accept) { + public void setAcceptThirdPartyCookies(WebView webview, boolean accept) { throw new MustOverrideException(); } |