summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-10-27 12:29:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-27 12:29:03 -0700
commitf3bac948e4f95dd17dc61505f9d12e84cb3c5ea6 (patch)
treeb7f70ac1a29e50699e57a4e159ff22f0c3e530dd
parente19b38932189d05c6a886e5563beacbbca6cff6d (diff)
parentdcd2d0dee9fb70f7e1e813355ed382a38e23fb46 (diff)
downloadframeworks_base-f3bac948e4f95dd17dc61505f9d12e84cb3c5ea6.zip
frameworks_base-f3bac948e4f95dd17dc61505f9d12e84cb3c5ea6.tar.gz
frameworks_base-f3bac948e4f95dd17dc61505f9d12e84cb3c5ea6.tar.bz2
Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack"
-rw-r--r--core/java/android/webkit/CookieManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index addea3e..dcac243 100644
--- 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);
}