Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper fix for bug 3407633

Browse Source 
Using WebAddress to parse the url, this way we will match the
java stack.

Change-Id: I30979df5ef347d9770985ebbb8139ec119764460
This commit is contained in:
Kristian Monsen
2011-02-01 20:20:39 +00:00
parent e37ce6fe79
commit 2d65a5fdac
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/webkit/CookieManager.java
View File

@@ -293,13 +293,6 @@ public final class CookieManager {
* @param value The value for set-cookie: in http response header
*/
public void setCookie(String url, String value) {
if (JniUtil.useChromiumHttpStack()) {
if (url.indexOf("://") == -1)
url = "http://" + url;
nativeSetCookie(url, value);
return;
}
WebAddress uri;
try {
uri = new WebAddress(url);
@@ -307,7 +300,12 @@ public final class CookieManager {
Log.e(LOGTAG, "Bad address: " + url);
return;
}
setCookie(uri, value);
if (JniUtil.useChromiumHttpStack()) {
nativeSetCookie(uri.toString(), value);
} else {
setCookie(uri, value);
}
}
/**
@@ -426,12 +424,6 @@ public final class CookieManager {
* @return The cookies in the format of NAME=VALUE [; NAME=VALUE]
*/
public String getCookie(String url) {
if (JniUtil.useChromiumHttpStack()) {
if (url.indexOf("://") == -1)
url = "http://" + url;
return nativeGetCookie(url);
}
WebAddress uri;
try {
uri = new WebAddress(url);
@@ -439,7 +431,12 @@ public final class CookieManager {
Log.e(LOGTAG, "Bad address: " + url);
return null;
}
return getCookie(uri);
if (JniUtil.useChromiumHttpStack()) {
return nativeGetCookie(uri.toString());
} else {
return getCookie(uri);
}
}
/**