Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack

Also requires a change to external/webkit ...
https://android-git.corp.google.com/g/76066

Bug: 3116410
Change-Id: If8562468708e7d68c5be53db3860647687ebf3bd

1 files changed, 11 insertions, 0 deletions

diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index 30101785974e..addea3ed4523 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -273,6 +273,11 @@ public final class CookieManager {
      * @param accept TRUE if accept cookie
      */
     public synchronized void setAcceptCookie(boolean accept) {
+        if (useChromiumHttpStack()) {
+            nativeSetAcceptCookie(accept);
+            return;
+        }
+
         mAcceptCookie = accept;
     }
 
@@ -281,6 +286,10 @@ public final class CookieManager {
      * @return TRUE if accept cookie
      */
     public synchronized boolean acceptCookie() {
+        if (useChromiumHttpStack()) {
+            return nativeAcceptCookie();
+        }
+
         return mAcceptCookie;
     }
 
@@ -1035,5 +1044,7 @@ public final class CookieManager {
 
     // Native functions
     private static native boolean nativeUseChromiumHttpStack();
+    private static native boolean nativeAcceptCookie();
     private static native void nativeRemoveAllCookie();
+    private static native void nativeSetAcceptCookie(boolean accept);
 }