Merge "Proper fix for bug 3407633" (f0bc2a61) · Commits · e / os / android_frameworks_base

core/java/android/webkit/CookieManager.java

+12 −15

Original line number	Diff line number	Diff line
		@@ -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,8 +300,13 @@ public final class CookieManager {
		Log.e(LOGTAG, "Bad address: " + url);
		return;
		}

		if (JniUtil.useChromiumHttpStack()) {
		nativeSetCookie(uri.toString(), value);
		} else {
		setCookie(uri, value);
		}
		}

		/**
		* Set cookie for a given uri. The old cookie with same host/path/name will
		@@ -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,8 +431,13 @@ public final class CookieManager {
		Log.e(LOGTAG, "Bad address: " + url);
		return null;
		}

		if (JniUtil.useChromiumHttpStack()) {
		return nativeGetCookie(uri.toString());
		} else {
		return getCookie(uri);
		}
		}

		/**
		* Get cookie(s) for a given uri so that it can be set to "cookie:" in http