Hook up CookieManager.getCookie() for Chromium HTTP stack

Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76603

Bug: 3116410
Change-Id: Id0cd5871fd13f952d4f2aa963576a4e610459a18

diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index addea3e..dcac243 100644 (file)
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -427,6 +427,10 @@ public final class CookieManager {
      * @return The cookies in the format of NAME=VALUE [; NAME=VALUE]
      */
     public String getCookie(String url) {
+        if (useChromiumHttpStack()) {
+            return nativeGetCookie(url);
+        }
+
         WebAddress uri;
         try {
             uri = new WebAddress(url);
@@ -1045,6 +1049,7 @@ public final class CookieManager {
     // Native functions
     private static native boolean nativeUseChromiumHttpStack();
     private static native boolean nativeAcceptCookie();
+    private static native String nativeGetCookie(String url);
     private static native void nativeRemoveAllCookie();
     private static native void nativeSetAcceptCookie(boolean accept);
 }