summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵akirilov2018-10-190-0/+0
|\ | | | | | | | | | | | | | | 4cfb6100df am: a7b3831011 am: 009e9d24ed am: 902506c4be am: d04296a513 am: 9606dee784 am: c01d04fa84 Change-Id: I2aa0c2e11f055e1cf232c86c3bae060a830e928c
| * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵akirilov2018-10-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | 4cfb6100df am: a7b3831011 am: 009e9d24ed am: 902506c4be am: d04296a513 am: 9606dee784 Change-Id: I6cc4e88d1cdeca605478ad280c1a044e57d7ed85
| | * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵akirilov2018-10-190-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cfb6100df am: a7b3831011 am: 009e9d24ed am: 902506c4be am: d04296a513 Change-Id: I730daa68e058de77b1feabb800d31c504ef43160
| | | * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵Android Build Merger (Role)2018-10-190-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 4cfb6100df am: a7b3831011 am: 009e9d24ed am: 902506c4be Change-Id: Ifd4f44dc604220455adb2b4d56ee5583c53a4ac6
| | | | * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵Android Build Merger (Role)2018-10-190-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cfb6100df am: a7b3831011 am: 009e9d24ed Change-Id: I59d463288c7ff8ea232e729409d813a0d6b7bbde
| | | | | * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵Android Build Merger (Role)2018-10-190-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cfb6100df am: a7b3831011 Change-Id: I2bfa2c725b01c57e8ae70a8b077cbdccc179b192
| | | | | | * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: ↵Android Build Merger (Role)2018-10-190-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cfb6100df Change-Id: I478e49c9b10328eda01dd8db3b7a687b841d7acd
| | | | | | | * [automerger] Fix CTS regression caused by ag/4690195 am: 73939a628bAndroid Build Merger (Role)2018-10-191-1/+3
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e7e32e7c1905e866dc2263bdf4d3719e806dd0c
| | | | | | | | * Fix CTS regression caused by ag/4690195akirilov2018-10-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111085900 Bug: 116183274 Test: run cts -m CtsAppTestCases -t android.app.cts.DownloadManagerTest#testDownloadManager android.app.cts.DownloadManagerTest#testDownloadManagerDestination android.app.cts.DownloadManagerTest#testDownloadManagerDestinationExtension android.app.cts.DownloadManagerTest#testDownloadManagerSupportsHttp android.app.cts.DownloadManagerTest#testDownloadManagerSupportsHttpWithExternalWebServer android.app.cts.DownloadManagerTest#testDownloadManagerSupportsHttpsWithExternalWebServer android.app.cts.DownloadManagerTest#testMinimumDownload Change-Id: I5c4ec97c5c4aa76bf9e0bbb352a470f230750bd9
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I35a406098293445c93a06e1bf82335323ef9dc7e
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id1fb3cadd075d0c20ad085fe4d4a29540b072716
* | | | | | | | | Ensure all android.process.media apps have usesCleartextTraffic=trueChad Brubaker2018-09-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib90c0f75763d52744834887633f8f6503a916b61 Fixes: 113533479 Test: DownloadManager CTS (cherry picked from commit 6cce476bc9d8fdf2edb161b878ae2a0aa6977265)
* | | | | | | | | [automerger skipped] Merge commit '6d489a5f' into aug10d-oc-dev am: ↵Jeff Sharkey2018-08-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c7dce84d8 am: fa03ea96b7 am: c3bc8bf5be -s ours Change-Id: I92ce0db6099b32f7a4cd3a84591f103f4ac4af4b
| * | | | | | | | Merge commit '6d489a5f' into aug10d-oc-dev am: 1c7dce84d8Jeff Sharkey2018-08-101-105/+92
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fa03ea96b7 Change-Id: I2026742053efc2cc85e8aead2c96fa5db3199719
| | * | | | | | | Merge commit '6d489a5f' into aug10d-oc-devJeff Sharkey2018-08-101-105/+92
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1c7dce84d8 Change-Id: I634f146b629a2fbcf293619337683b59afd4b41a
| | | * | | | | | Merge commit '6d489a5f' into aug10d-oc-devJeff Sharkey2018-08-101-105/+92
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111085900 Change-Id: I2f224f04d1ae39a64a9c0784fe0c9cab284d88e8
| | | | * | | | | Merge commit 'b760a3bb' into aug10d-nyc-mr2-devJeff Sharkey2018-08-101-102/+93
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111085900 Change-Id: Ie12be47f760402566801eb42f5defa0611a51ca2
| | | | | * | | | Merge commit '21428513' into aug10d-cw-f-devJeff Sharkey2018-08-101-102/+93
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111085900 Change-Id: Ia1b146d58b74988ba962bc8e5155d027434f7e0e
| | | | | | * | | Merge commit '25e04e39' into aug10d-nyc-mr1-devJeff Sharkey2018-08-101-102/+93
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111085900 Change-Id: I01cee751563a32e0b1deb181f820339d21ed6272
| | | | | | | * | Merge commit 'd728a508' into aug10d-nyc-dr1-devJeff Sharkey2018-08-101-103/+92
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111085900 Change-Id: Idc5260b874063b7a5c7fe07b95883467ed8be449
| | | | | | | | * DO NOT MERGE. All untrusted selections must go through builder.Jeff Sharkey2018-08-101-103/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accepting untrusted selections, they must be passed directly to SQLiteQueryBuilder to ensure that setStrict() can be applied to check for malicious callers sending unbalanced parentheses. This means we can't mix local and remote selections; they always need to be kept separate. Use newly added SQLiteQueryBuilder functionality to apply strict detection to update() and delete() calls. Only allow the owner of a particular download to query the headers for that download. Only delete headers for a download once we've confirmed that caller can modify that download. Test: atest packages/providers/DownloadProvider/tests/ Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java Bug: 111085900 Change-Id: I9fd8e0d3cf80d7603bf0092f36fe449467090821 Merged-In: I9fd8e0d3cf80d7603bf0092f36fe449467090821
* | | | | | | | | Merge "DO NOT MERGE. All untrusted selections must go through builder." into ↵Jeff Sharkey2018-08-101-105/+91
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-dev
| * | | | | | | | | DO NOT MERGE. All untrusted selections must go through builder.Jeff Sharkey2018-08-031-105/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accepting untrusted selections, they must be passed directly to SQLiteQueryBuilder to ensure that setStrict() can be applied to check for malicious callers sending unbalanced parentheses. This means we can't mix local and remote selections; they always need to be kept separate. Use newly added SQLiteQueryBuilder functionality to apply strict detection to update() and delete() calls. Only allow the owner of a particular download to query the headers for that download. Only delete headers for a download once we've confirmed that caller can modify that download. Test: atest packages/providers/DownloadProvider/tests/ Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java Bug: 111085900 Change-Id: I9fd8e0d3cf80d7603bf0092f36fe449467090821 Merged-In: I9fd8e0d3cf80d7603bf0092f36fe449467090821
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-08-031-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie16a2d3550ec50409c2396f439222fdec04af5e7
* | | | | | | | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 ↵Jeff Sharkey2018-07-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f0b5c44c8 am: 3439b74e4a am: b2db30a21e am: 84cefc516e am: 32a92d0a73 am: 9c2867c8a1 Change-Id: I93ec2760b7db41dcb551bcdf16c6d38df078ab52
| * | | | | | | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 ↵Jeff Sharkey2018-07-121-12/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f0b5c44c8 am: 3439b74e4a am: b2db30a21e am: 84cefc516e am: 32a92d0a73 Change-Id: Ib38b3c09bfaf7e159712b09b6c8f1b82ed33833d
| | * | | | | | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 ↵Jeff Sharkey2018-07-121-12/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f0b5c44c8 am: 3439b74e4a am: b2db30a21e am: 84cefc516e Change-Id: Iabab984d78bad2ca6b5904e31482044e4627d02a
| | | * | | | | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 ↵Android Build Merger (Role)2018-07-091-12/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f0b5c44c8 am: 3439b74e4a am: b2db30a21e Change-Id: I4e2fda8c302ddfaa0edeb226029c94ff3771f89f
| | | | * | | | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 ↵Android Build Merger (Role)2018-07-091-12/+2
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f0b5c44c8 am: 3439b74e4a Change-Id: I1509a4dc66f4d57701d54b7743de3bd9915258c7
| | | | | * | | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8 ↵Android Build Merger (Role)2018-07-091-12/+2
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f0b5c44c8 Change-Id: I7b24ea92c1227e4581e72b551e3ebac4b4bd3528
| | | | | | * | | [automerger] Remove "public" download feature. am: 35e123117b am: 52b9a670b8Android Build Merger (Role)2018-07-091-12/+2
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I55c96981db12008e619333f67ea8033e79ca5bd2
| | | | | | | * | [automerger] Remove "public" download feature. am: 35e123117bAndroid Build Merger (Role)2018-07-091-12/+2
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0347a0a15e99a224df13b756dc3d27de23835cae
| | | | | | | | * Remove "public" download feature.Jeff Sharkey2018-07-091-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was never a supported API, and has been reported as causing security issues, so remove it. Bug: 111084083 Test: builds Change-Id: I26345b192ffd55216bb8c8fdb82cb5869d68d3db
* | | | | | | | | Remove "public" download feature.Jeff Sharkey2018-07-091-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was never a supported API, and has been reported as causing security issues, so remove it. Bug: 111084083 Test: builds Change-Id: I26345b192ffd55216bb8c8fdb82cb5869d68d3db
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ibe041341d032a0eb9b0f31b74db37c2e3de38df9
* | | | | | | | | [automerger skipped] DO NOT MERGE: Update DownloadProvider for correct ↵Benedict Wong2018-05-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meteredness am: b627002ea9 -s ours Change-Id: I30abd24766074caf2032db1885d900f21a389669
| * | | | | | | | DO NOT MERGE: Update DownloadProvider for correct meterednessBenedict Wong2018-05-234-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates DownloadProvider to use the fixed meteredness hidden APIs for OC-MR1. This corrects a bug where DownloadProvider would fail to allow downloads to proceed when VPNs are connected, but the underlying networks are metered. Bug: 78644887 Test: Flashed on Walleye and tested. Change-Id: I13c1bd6d7ab26489923329bc7985060228e9bb29
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-05-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I0b8d0aa0b18c9440b067a00ac4f2790dee215ad5
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic117651a98fdbbcb2247b394399a715cb69cbf64
* | | | | | | | | | Use the network security config's cleartext settingsChad Brubaker2018-04-134-36/+14
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously DownloadManager only respected the manifest attribute, this change makes DownloadManager handle both the manifest and the network security config Change-Id: I5666a1eea6278acc3864620a0e5a4c3ae37635b8 Fixes: 78028215 Test: atest CtsNetSecConfigDownloadManagerTestCases
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-123-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Iac2c9e4c43917aed90f24e41588b748144313b4d
* | | | | | | | | Merge "Exempt tests from hidden API checks." into pi-devTreeHugger Robot2018-04-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Exempt tests from hidden API checks.Nicolas Geoffray2018-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64382372 Bug: 74963051 Test: m Change-Id: I8a6e22a3ef027b562355f63edf9354732e2d3938
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-062-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ia0c399e7663719ae60634e60e91171bbc640ed3a
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ica2a3f32d8246505309e065b858509fc1d0dfe40
* | | | | | | | | Return underlying MIME type of download.Jeff Sharkey2018-03-271-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only return extension-based MIME types for raw files. Test: none Bug: 73736356 Change-Id: I228916fd408cd95f1acf43817fa43ee8646cbd4e
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5883e2bfb8 -s ours Change-Id: I14ca12dc9ef203c8e5931844650cf646e866c8a2
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-085-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id8dfe579b939fddc79741d453ef5aaf195841fcf
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-083-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7726e04d1e9d3114e3955432a0247fdbf8b279e9