summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorHector Dearman <hjd@google.com>2014-07-24 17:53:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:36:05 +0000
commitd49d6bf0cd12952b7fe4377d6cefbcad297ed8d3 (patch)
treefe05608ce3c11644085d394f0544041d974110e9 /core
parent9a89bc6524620c87c7a321433470c668e2b95d69 (diff)
parentffae67288198b941cd8d266ca272474818d2da6c (diff)
downloadframeworks_base-d49d6bf0cd12952b7fe4377d6cefbcad297ed8d3.zip
frameworks_base-d49d6bf0cd12952b7fe4377d6cefbcad297ed8d3.tar.gz
frameworks_base-d49d6bf0cd12952b7fe4377d6cefbcad297ed8d3.tar.bz2
Merge "Update CookieManager API for Council review." into lmp-dev
Diffstat (limited to 'core')
-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 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();
}