From 42a9ee5036f18866a5341c83bb6fcde7c8b355ff Mon Sep 17 00:00:00 2001
From: Hector Dearman <hjd@google.com>
Date: Tue, 26 Aug 2014 10:18:40 +0100
Subject: [PATCH] Remove synchronized from acceptThirdPartyCookies()

As per API council feedback.

Bug: 17253647
Change-Id: Ide3d4b216f01a96e54111f885813ca8a7c3865ba
---
 api/current.txt                             | 2 +-
 core/java/android/webkit/CookieManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 85a3fc526480b..9743cf1578358 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36615,7 +36615,7 @@ package android.webkit {
 
   public class CookieManager {
     method public synchronized boolean acceptCookie();
-    method public synchronized boolean acceptThirdPartyCookies(android.webkit.WebView);
+    method public boolean acceptThirdPartyCookies(android.webkit.WebView);
     method public static boolean allowFileSchemeCookies();
     method public void flush();
     method public java.lang.String getCookie(java.lang.String);
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index 7c30d2a0bfb25..de7d2d0e727b9 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -98,7 +98,7 @@ public class CookieManager {
      * @param webview the {@link WebView} instance to get the cookie policy for
      * @return true if the {@link WebView} accepts third party cookies
      */
-    public synchronized boolean acceptThirdPartyCookies(WebView webview) {
+    public boolean acceptThirdPartyCookies(WebView webview) {
         throw new MustOverrideException();
     }