summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-03-01 14:35:03 -0800
committerJohn Reck <jreck@google.com>2011-03-01 14:35:03 -0800
commit09407b481043079ddcd553059b16e981a3f524e6 (patch)
tree3df9b8d0c0e19d61341f00d3d683f11ae745c7c9 /core
parente4dcf0948a7c0b357696a813217f7b7603ffd8ac (diff)
downloadframeworks_base-09407b481043079ddcd553059b16e981a3f524e6.zip
frameworks_base-09407b481043079ddcd553059b16e981a3f524e6.tar.gz
frameworks_base-09407b481043079ddcd553059b16e981a3f524e6.tar.bz2
Send correct cookies for HTML5 video when incognito
Bug: 3489551 Change-Id: Ic35ec725e72e97830afff2fb0392b2300d8c45f6
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/HTML5VideoViewProxy.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index 2cc3881..85763da 100644
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -184,12 +184,13 @@ class HTML5VideoViewProxy extends Handler
mVideoView.setWillNotDraw(false);
mVideoView.setMediaController(new MediaController(proxy.getContext()));
- String cookieValue = CookieManager.getInstance().getCookie(url);
+ boolean isPrivate = mCurrentProxy.getWebView().isPrivateBrowsingEnabled();
+ String cookieValue = CookieManager.getInstance().getCookie(url, isPrivate);
Map<String, String> headers = new HashMap<String, String>();
if (cookieValue != null) {
headers.put(COOKIE, cookieValue);
}
- if (mCurrentProxy.getWebView().isPrivateBrowsingEnabled()) {
+ if (isPrivate) {
headers.put(HIDE_URL_LOGS, "true");
}