Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf22691 authored by Hector Dearman's avatar Hector Dearman Committed by Android Git Automerger
Browse files

am fb8f0643: am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev 

* commit 'fb8f0643434630be607abea3ac4e9f7558311b99':
  Update CookieManager API for Council review.
parents e6be6fad 7bda3995

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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>);

  }

core/java/android/webkit/CookieManager.java

+1 −2
Original line number Diff line number Diff line
@@ -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();

    }