Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE

Setting http:// at the start if there is no :// in the url

Change-Id: Idfae4f724808267fe9c8ab3864cfc4305ddac0e7

diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index ff9fe1c..1fea65a 100644 (file)
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -294,6 +294,8 @@ public final class CookieManager {
      */
     public void setCookie(String url, String value) {
         if (JniUtil.useChromiumHttpStack()) {
+            if (url.indexOf("://") == -1)
+                url = "http://" + url;
             nativeSetCookie(url, value);
             return;
         }
@@ -425,6 +427,8 @@ public final class CookieManager {
      */
     public String getCookie(String url) {
         if (JniUtil.useChromiumHttpStack()) {
+            if (url.indexOf("://") == -1)
+                url = "http://" + url;
             return nativeGetCookie(url);
         }