diff options
| author | John Reck <jreck@google.com> | 2011-03-01 15:07:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 15:07:39 -0800 |
| commit | 7a3a51d0f5eedb977b00e87003368d4bb81b35c0 (patch) | |
| tree | 46bdd94aab29b6256ad9844f3aa6387c291b796e /core | |
| parent | e6c524022deb665439a442ab8b66f2917ca62ca2 (diff) | |
| parent | 09407b481043079ddcd553059b16e981a3f524e6 (diff) | |
| download | frameworks_base-7a3a51d0f5eedb977b00e87003368d4bb81b35c0.zip frameworks_base-7a3a51d0f5eedb977b00e87003368d4bb81b35c0.tar.gz frameworks_base-7a3a51d0f5eedb977b00e87003368d4bb81b35c0.tar.bz2 | |
Merge "Send correct cookies for HTML5 video when incognito"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 5 |
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"); } |