summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importlineage-16.0Michael W2020-03-2859-55/+99
| | | | Change-Id: I066594506ad627bc18be8b34f5e10679b6b8b602
* Automatic translation importMichael W2020-01-141-0/+31
| | | | Change-Id: Ie7e72168891c1e06b42d9a2854b400b64a1cb79d
* Merge tag 'android-9.0.0_r50' into staging/lineage-16.0_merge-android-9.0.0_r50Kevin F. Haggerty2019-11-112-345/+107
|\ | | | | | | | | | | | | | | | | | | | | Android 9.0.0 release 50 * tag 'android-9.0.0_r50': RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. DO NOT MERGE. All untrusted selections must go through builder. Remove "public" download feature. Change-Id: I44724324b02dce397f46b938b5bbb70f6b4e81a4
| * RESTRICT AUTOMERGEJeff Sharkey2019-09-182-345/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable stricter SQLiteQueryBuilder options. Malicious callers can leak side-channel information by using subqueries in any untrusted inputs where SQLite allows "expr" values. This change starts using setStrictColumns() and setStrictGrammar() on SQLiteQueryBuilder to block this class of attacks. This means we now need to define the projection mapping of valid columns, which consists of both the columns defined in the public API and columns read internally by DownloadInfo.Reader. We're okay growing sAppReadableColumnsSet like this, since we're relying on our trusted WHERE clause to filter away any rows that don't belong to the calling UID. Remove the legacy Lexer code, since we're now internally relying on the robust and well-tested SQLiteTokenizer logic. Bug: 135270103 Bug: 135269143 Test: atest DownloadProviderTests Test: atest CtsAppTestCases:android.app.cts.DownloadManagerTest Change-Id: I302091ceda3591785b2124575e89dad19bc97469 (cherry picked from commit d3e5c766a143853580dd6642a4a32c5d1a6f9fb1)
| * DO NOT MERGE. All untrusted selections must go through builder.Jeff Sharkey2018-08-151-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 (cherry picked from commit 64b55ea82b1f394369237601ae1f1c78b776aabc)
| * Remove "public" download feature.Jeff Sharkey2018-08-011-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 (cherry picked from commit ce9f204ac493f000cd3020e195fd5038d0cec1e2)
* | Automatic translation importMichael Bestas2019-08-252-0/+56
| | | | | | | | Change-Id: I956e1a5dafc1e999470dd9178c06d207fb051dc8
* | Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsiLuca Stefani2019-07-130-0/+0
|\ \ | | | | | | | | | | | | | | | * aosp/pie-gsi: Change-Id: I9d20e05e7d09d27ee5eba513dbb551f4de939d2c
| * \ Merge "Snap for 5450365 from 57fb22ac21d2aa8bdc65c6984567e04a93d27256 to ↵Android Merger2019-05-137-107/+107
| |\ \ | | | | | | | | | | | | pi-platform-release am: a10cb23d08" into pie-gsi
| | * | Snap for 5450365 from 57fb22ac21d2aa8bdc65c6984567e04a93d27256 to ↵android-build-team Robot2019-05-137-107/+107
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: a10cb23d08 Change-Id: I16a15531ab181a920289d79ce6892c18271e4b88
| | * | Snap for 5450365 from 57fb22ac21d2aa8bdc65c6984567e04a93d27256 to ↵android-build-team Robot2019-05-077-107/+107
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: Idf5c4d51b76fd4eec9e296a218d5d59138649b58
| * | \ \ Merge "Snap for 5180536 from 91873a4c1851268f0b7f86cc33bb3403fe24b2ad to ↵Android Merger2019-02-114-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | pi-platform-release am: ac2c2c0eea" into pie-gsi
| | * | | | Snap for 5180536 from 91873a4c1851268f0b7f86cc33bb3403fe24b2ad to ↵android-build-team Robot2019-02-114-5/+5
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: ac2c2c0eea Change-Id: Ia9c2fb479c4fa56fe07a70d9e38c7b4e2a104c17
| | * | | Snap for 5180536 from 91873a4c1851268f0b7f86cc33bb3403fe24b2ad to ↵android-build-team Robot2019-02-095-6/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I69bd06180a0e929919739ba238a7be3485a133ee
* | | | | | Automatic translation importMichael Bestas2019-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I347c86e77c9445277e53c267eb410b42abfe0411
* | | | | | Automatic translation importMichael Bestas2019-06-087-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71273a75677ee652a6b373e0b78d7b96b072a084
* | | | | | Merge tag 'android-9.0.0_r37' into staging/lineage-16.0_merge-android-9.0.0_r37Kevin F. Haggerty2019-05-067-107/+107
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 37 (PQ3A.190505.002) * tag 'android-9.0.0_r37': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Change-Id: I6665492b351159cccd82069bb80eac0bfdae5489
| * | | | | Snap for 5322077 from 2b3342d3efe30f55f37fb8cce94d0a12baee92f6 to ↵android-build-team Robot2019-02-203-74/+74
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-release Change-Id: I0fd0a8acb132cf0ce6120279dcaddae43167f759
| | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-173-74/+74
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1dd00241611af7bcee14c09b9d50c2d701332826
| * | | | | Import translations. DO NOT MERGEBill Yi2019-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9f491b39a6464db17407aa71eb3bb54c680b5a70
| * | | | | Import translations. DO NOT MERGEBill Yi2018-12-283-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Iade6e5fe88f90024f5b5e74951cc8b4d997e59ea
* | | | | | Automatic translation importMichael Bestas2019-04-0712-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I151aaaf05c2c9f7f80f13532ff6b4a8f51bc8f02
* | | | | | Automatic translation importMichael W2019-03-11250-6628/+24
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcc1600b3b151b6a97f8d2b364dcc7945657e4f4
* | | | | | Automatic translation importMichael Bestas2019-02-2619-411/+38
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd72b2cf3d002ddc1566a4f2ec7c06771343dfff
* | | | | | Merge tag 'android-9.0.0_r31' into lineage-16.0-android-9.0.0_r31Luca Stefani2019-02-064-5/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 31 (PQ2A.190205.001) * tag 'android-9.0.0_r31': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix CTS regression caused by ag/4690195 Import translations. DO NOT MERGE Import translations. DO NOT MERGE Ensure all android.process.media apps have usesCleartextTraffic=true Change-Id: I93e08750f827838fbb315c8bc44d4e5fa1987906
| * | | | | Snap for 5130385 from 7316cf114c17cb25fd11bfb3cdbdb8fe303fa42c to ↵android-build-team Robot2018-11-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I247a1b7b0b5cf2a1dbf270da3ba3a5f77c6760b7
| | * | | | Import translations. DO NOT MERGEBill Yi2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9ff68bfdd33db22dc725b3339902b9ef148ff5e5
| * | | | | Snap for 5115288 from fa6c3d88ed8cb2ca01a23356bd4a878b55721ed1 to ↵android-build-team Robot2018-11-071-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I67ad028ca32c23992b8d3c223fa04d691a29fd7b
| | * | | | Import translations. DO NOT MERGEBill Yi2018-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7844484c0a90c3f60276998185779161de9bd74a
| * | | | | Snap for 5087486 from 9e6b883be5731dd7077390aea5b90644832fe3c2 to ↵android-build-team Robot2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: Icb4ee2da06524716d619945a8df5da7443ec2ad7
| | * | | | [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
| * | | | | | | | | | | | | Snap for 5073521 from a66ee95ea755555a9f7fc7e08c1c7a5e355c1c87 to ↵android-build-team Robot2018-10-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I794df54d2debf667913bb928e29f08abba2f6b41
| | * | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I35a406098293445c93a06e1bf82335323ef9dc7e
| * | | | | | | | | | | | | Snap for 5044688 from 2ab5ac1cdb518f06b86a7777bffb54c81ca119e5 to ↵android-build-team Robot2018-10-022-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I5b7a7cc563ad1aede20d6a69ba6376fcab5ae5c0
| | * | | | | | | | | | | | 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)
* | | | | | | | | | | | | | Automatic translation importMichael Bestas2019-01-12254-0/+11064
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49173cb1cdfbb4e3301c0cf66f4213997e0af420
* | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-gsiLuca Stefani2018-11-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/pie-gsi: Ensure all android.process.media apps have usesCleartextTraffic=true Change-Id: I21580b70aaa3d907f630b7d2a5fb2ef52a3deda2
| * | | | | | | | | | | | | Merge "Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release am: ↵Android Merger2018-11-302-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cfb7dd85b" into pie-gsi
| | * | | | | | | | | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-302-2/+2
| |/| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9cfb7dd85b Change-Id: I9aaedc3e58886b10348a02b268b1622de98eb9c3
| | * | | | | | | | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-282-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1036dddd138385bda19dc13c06d99287b9262653
| * | | | | | | | | | | | | Merge "Ensure all android.process.media apps have usesCleartextTraffic=true" ↵Treehugger Robot2018-11-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pie-gsi