summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-13Merge "Don't view images with src="javascript:...""HEADandroid-m-preview-2android-m-preview-1android-m-previewmastermainPaul Miller
2015-05-11Don't view images with src="javascript:..."Paul Miller
BUG:19296937 Change-Id: I349750fe6fe7ef86c72b2952729a35b2be526e97
2015-04-07Merge "Forbid javascript- and file-scheme intents"android-wear-5.1.1_r1android-wear-5.1.0_r1master-soongPaul Miller
2015-04-06Forbid javascript- and file-scheme intentsPaul Miller
BUG:13082135 BUG:19296779 Change-Id: Ifea908b175670fbce65205797b93e87adf25bb3d
2015-04-06Merge "Revert "Restrict "javascript" and "file" scheme intents""Paul Miller
2015-04-06Revert "Restrict "javascript" and "file" scheme intents"Paul Miller
This reverts commit ca7ecd85ac925ef44dbef327310f2baad13322f2. Change-Id: I64460956e6243908a6c575eb4d3c7455efc86dff
2015-04-02Merge "Restrict "javascript" and "file" scheme intents"Paul Miller
2015-04-02Restrict "javascript" and "file" scheme intentsPaul Miller
"javascript" is not allowed; "file" is only allowed in certain directories BUG:19296779 BUG:13082135 Change-Id: I389a5b0ad3e8add1b1159faca3212c7f11f3ae69
2015-04-01Merge "Finish removing "inline" URI scheme"Paul Miller
2015-04-01Finish removing "inline" URI schemePaul Miller
It was incompletely removed in 068e48b469f5abca53ee3da38f933cf2c25c93b8 Change-Id: Ie8816726cde8f898d69cd101cea66ddbb4b6e288
2015-03-12Merge "browser: set security state even if user disable security alerts"Richard Coles
2015-03-11browser: set security state even if user disable security alertsJorge Ruesga
Even if a user disabled the security alerts (ssl errors), the security state SHOULD be set to show that the certificate has a problem. Actually, the certificate is reported as valid, which is complety wrong. Change-Id: I520bf2553942d04287d872428c4a73186ba1ceef Signed-off-by: Jorge Ruesga <j.ruesga.criado@gmail.com>
2015-02-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ie8f853c30e0096911a737dc69c69772cffa1d998 Auto-generated-cl: translation import
2015-02-12am f88fc286: Merge "Show JS alerts over their origin tab"Paul Miller
* commit 'f88fc2863c2b42e254729fd1fab2808dcaa16b39': Show JS alerts over their origin tab
2015-02-12Merge "Show JS alerts over their origin tab"Paul Miller
2015-02-12Show JS alerts over their origin tabPaul Miller
BUG:18416812 Change-Id: I25964690bdf579a4fd23fcb6e7c0f6681f0f3661
2015-01-07am a9c8a585: Merge "Remove stray unused import."Narayan Kamath
* commit 'a9c8a585372f2c61270b515d4857a595012e0301': Remove stray unused import.
2015-01-07Merge "Remove stray unused import."Narayan Kamath
2015-01-07Remove stray unused import.Narayan Kamath
Change-Id: I52e2c41bec5131ecfb34fc9129888ca6678c3c2b
2014-12-19am de5a4d4a: Merge "Move browser over to java.net.URLConnection."Narayan Kamath
* commit 'de5a4d4ac7a11708e1c93d6864c2447f029248fd': Move browser over to java.net.URLConnection.
2014-12-19Merge "Move browser over to java.net.URLConnection."Narayan Kamath
2014-12-16Move browser over to java.net.URLConnection.Narayan Kamath
bug: 18027885 Change-Id: Ie1db66432f0bd2b2eaaf2a7998828f69145645d9
2014-12-11am 3bf59298: Merge "Implement BrowserPreferencePage.isValidFragment."Ben Murdoch
* commit '3bf59298765b441ba3cd26f0731253962c190387': Implement BrowserPreferencePage.isValidFragment.
2014-12-11Merge "Implement BrowserPreferencePage.isValidFragment."android-wear-5.0.0_r1lollipop-wear-releaseBen Murdoch
2014-12-11am 5baac25e: Merge "Log an error when no activity is found to handle a URL."Ben Murdoch
* commit '5baac25e0601e9894ee6fc690a9f6d0f534af4a2': Log an error when no activity is found to handle a URL.
2014-12-11Merge "Log an error when no activity is found to handle a URL."Ben Murdoch
2014-12-11Log an error when no activity is found to handle a URL.Ben Murdoch
Rather than crashing due to ActivityNotFoundException. Bug: 13930087 Change-Id: Id3af8301bb87298b885a24f70bf184abe4fc2a11
2014-12-11Implement BrowserPreferencePage.isValidFragment.Ben Murdoch
Bug: 18284779 Change-Id: I0f285e3577ce24784d45bbe35f45179febe27a9d
2014-11-03am fe15d2a0: am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost"Narayan Kamath
* commit 'fe15d2a0bf7b10a21a53a4e286f6bad5ccbce7d3': Rewrite calls to Proxy.getPreferredHttpHost
2014-11-03am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost"Narayan Kamath
* commit 'e702d54594f8bd9472732c0ee35cd6503862633e': Rewrite calls to Proxy.getPreferredHttpHost
2014-11-03Merge "Rewrite calls to Proxy.getPreferredHttpHost"Narayan Kamath
2014-10-31am 3c909ae2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '3c909ae26804ba2403cf2b292b8968310558fc4b': Import translations. DO NOT MERGE
2014-10-30Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I97f50623444c023b843cc615ac252944bfc3ceca Auto-generated-cl: translation import
2014-10-27Rewrite calls to Proxy.getPreferredHttpHostNarayan Kamath
Use java.net.URLConnection which is the only maintained method of making http requests from java. These were the last calls to getPreferredHttpHost and that hidden API will now be deleted. Change-Id: I97e022507ba656f627754af4e889f4812314ea90
2014-10-27am b97f51f5: am 253bd01f: am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch
* commit 'b97f51f504e21a92a767dfe4a6ca21ad196006fc':
2014-10-27am 257d565a: am 885694b2: am 481681a1: Using .jpg as suffix of the temporay ↵Tao Bai
file for camera. * commit '257d565a9d374fd3a22d4732004f77ee1459083b':
2014-09-22am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch
* commit 'a1f40f93fc1eb046a06683cafc62205a7ec6ca0c': Pass ClipData in media capture Intent.
2014-09-22am 253bd01f: am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch
* commit '253bd01f659ed14aeb2352a0296ba9bf58a0b37e': Pass ClipData in media capture Intent.
2014-09-22am a1f40f93: Pass ClipData in media capture Intent.Ben Murdoch
* commit 'a1f40f93fc1eb046a06683cafc62205a7ec6ca0c': Pass ClipData in media capture Intent.
2014-09-22Pass ClipData in media capture Intent.android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaseBen Murdoch
This is necessary to ensure that the capture application has permission to read the URI that we are asking it to save the capture media into. Bug: 17524075 Change-Id: I6337e58f2610005fb22525e9ae45b037e9832db0
2014-09-19am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai
* commit '481681a1d37ea51a6b1ee53600efeb5013666c58': Using .jpg as suffix of the temporay file for camera.
2014-09-19am 885694b2: am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai
* commit '885694b20834a49f4c6b5d69ab25eace36f16f93': Using .jpg as suffix of the temporay file for camera.
2014-09-19am 481681a1: Using .jpg as suffix of the temporay file for camera.Tao Bai
* commit '481681a1d37ea51a6b1ee53600efeb5013666c58': Using .jpg as suffix of the temporay file for camera.
2014-09-18Using .jpg as suffix of the temporay file for camera.Tao Bai
Also, change to use the returned file from camcorder. Because the site might rely on the suffix to know the selected file type. BUG:17524075 Change-Id: I7b393d825b5dd11c47337de1feb7d0307fee96d7
2014-09-13am 2e72708a: am 934dfe52: Accept third party cookies if cookie setting is ↵Tao Bai
enabled by user * commit '2e72708a8930ea49a56583cad4b12ae4a5ebb66a': Accept third party cookies if cookie setting is enabled by user
2014-09-12am 934dfe52: Accept third party cookies if cookie setting is enabled by userTao Bai
* commit '934dfe5246cd151ffd60eb6277088f58f657b81c': Accept third party cookies if cookie setting is enabled by user
2014-09-12Accept third party cookies if cookie setting is enabled by userTao Bai
BUG:17474704 Change-Id: I8f9f17887cf65c1c5465b576dcf094784266b15b
2014-09-10am 2979e786: am 126b5b3a: Adapt AOSP browser to use the revised ↵Tao Bai
createIntent() API * commit '2979e7861f4fd053dce21ef50ed65605537479e7': Adapt AOSP browser to use the revised createIntent() API
2014-09-10am 126b5b3a: Adapt AOSP browser to use the revised createIntent() APITao Bai
* commit '126b5b3a771fbcf1a4acd1700c8cfa22975f22df': Adapt AOSP browser to use the revised createIntent() API
2014-09-10Adapt AOSP browser to use the revised createIntent() APITao Bai
BUG:17253647,16624450 Change-Id: I0b58d945564923c4ed0fc9377a3f6267d8080c2f