drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash with HTML5 video." into ics-mr1

Browse Source
This commit is contained in:
Ben Murdoch
2011-12-01 09:03:22 -08:00
committed by Android (Google) Code Review
parent 2a40d0d92b d3f18b805e
commit 90ea4c4d30
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,6 +345,11 @@ public final class CookieManager {
* a system private class.
*/
public synchronized void setCookie(WebAddress uri, String value) {
if (JniUtil.useChromiumHttpStack()) {
nativeSetCookie(uri.toString(), value, false);
return;
}
if (value != null && value.length() > MAX_COOKIE_LENGTH) {
return;
}
@ -500,6 +505,10 @@ public final class CookieManager {
* is a system private class.
*/
public synchronized String getCookie(WebAddress uri) {
if (JniUtil.useChromiumHttpStack()) {
return nativeGetCookie(uri.toString(), false);
}
if (!mAcceptCookie || uri == null) {
return null;
}
@ -573,6 +582,8 @@ public final class CookieManager {
* {@hide} Too late to release publically.
*/
public void waitForCookieOperationsToComplete() {
// Note that this function is applicable for both the java
// and native http stacks, and works correctly with either.
synchronized (this) {
while (pendingCookieOperations > 0) {
try {