summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-08Merge tag 'android-11.0.0_r40' into lineage-18.1HEADlineage-18.1alk3pInjection
Android 11.0.0 Release 40 (RQ3A.210805.001.A1) Change-Id: I669442cfe31142509964a3be72168fe77e44d951
2021-06-16Merge cherrypicks of [14988379, 14988380, 14984749, 14988513, 14988333, ↵android-build-team Robot
14988334, 14988398, 14985920, 14988097, 14988381, 14985921, 14988891, 14987186, 14988382, 14989110, 14988514, 14988515, 14988652, 14988653, 14988654, 14988399, 14988400, 14988401, 14984579, 14987188, 14988532, 14988533, 14988402, 14983067, 14983068, 14974447, 14974448, 14988656, 14988535, 14988536, 14988537, 14988538, 14988539, 14988540, 14988541] into rvc-qpr3-release Change-Id: I779e15a58383b9a6749f2d1b6e00f2f4bb19fbe0
2021-06-16DO NOT MERGE Fix floating point to text conversion overflowZim
Any precision >=2147483647 will cause a buffer overflow. For instance, executing the following statement will segfault select (printf('%.2147483647G',0.01)); Later sqlite versions fixed this by hard-coding a hard-limit of 100k million on the precision of floating point to text conversions https://sqlite.org/src/info/d08d3405878d394e We fix this on earlier versions by setting the compile time flag to the same 100k million Bug: 153352319 Test: builds Change-Id: Ied86cf81f0064da9d3d963ecf943894bc1ae1a93 (cherry picked from commit 4810d35fd17c3ab2f1fcbe9a0c73a8c587623d89)
2021-03-24sqlite: Upgrade to SQLite 3.32.2Lalit Maganti
This change is a cherry-pick of aosp/1337179 which is being merged here because of merge conflicts due to changes [1] and [2] which were made in internal master and rvc-dev but not in AOSP. Downloaded from https://www.sqlite.org/2020/sqlite-autoconf-3320200.tar.gz $ sha1sum sqlite-autoconf-3320200.tar.gz 429e3f2d0b16a95ad1025a97b2a328d0b4037575 sqlite-autoconf-3320200.tar.gz dist/orig contains the stock sqlite3 code, as packaged in the tar.gz file above. dist contains a copy of dist/orig, but with the Android.patch file applied. More details about the release are available here: https://www.sqlite.org/releaselog/3_32_2.html [1] ag/0f62c1a0e8b463b5b27035e11478e66d7daec69a [2] ag/88147c430cc041a27d07e593ffea12b7aa586f7a Test: code compiles and device boots with no problems. Test: select sqlite_version() - returns 3.32.2 Test: atest cts/SQLiteDatabaseTest all passed. Test: atest cts/SQLiteSecurityTest Bug: 159105124 Change-Id: I5c5fa2fd90292483bf20d8ae58adad41c48aa4e6
2020-07-20Update fix for issue 147928666. am: bb1d95a02e am: b23e9c1375Narayan Kamath
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/12186308 Change-Id: Id9044edebdd0893ba4771bcad6a0242a31537a4c
2020-07-20Update fix for issue 147928666. am: bb1d95a02eNarayan Kamath
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/12186308 Change-Id: Ifaa0e35c6b4b7cd4319a410aea4bbf0f89bb3c9c
2020-07-20Update fix for issue 147928666.Narayan Kamath
The compile time flag was added to the wrong place in change 88147c4. Bug: 147928666 Test: atest SQLiteSecurityTest Change-Id: I221f4e56b21a2573fd33d92389601af18752e905
2020-07-17Fix for sqlite3_open_v2 returning errors. am: 04524550f0 am: 29db312b0cAlex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/12174726 Change-Id: I97688565311925615d40b3dfe34379e93ed5c075
2020-07-17Fix for sqlite3_open_v2 returning errors. am: 04524550f0Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/12174726 Change-Id: If24c5ae4bcec664f7f323c23878068c47c904c96
2020-07-17Fix for sqlite3_open_v2 returning errors.Alex Buynytskyy
Happened after default compilation flags changed in ag/11474704. The fix is to revert the flags for just this library. Fixes: 160728363 Test: manually install the apk in the bug and verify it's not crashing/throwing the exception. Change-Id: I9e02a810bee088b35d25921086810f695956d6d3 Merged-In: I9e02a810bee088b35d25921086810f695956d6d3
2020-05-11Fix 'ALTER RENAME TABLE' compat issue am: 88147c430c am: e200c92bf7Zim
Change-Id: Ifb44b96634adca28299e0d316895f2e4a89e35b0
2020-05-11Fix 'ALTER RENAME TABLE' compat issue am: 88147c430cZim
Change-Id: Ia0140452bffcc4dc341a35b4497a1f2371912d50
2020-05-11Fix 'ALTER RENAME TABLE' compat issueZim
This CL disables SQLite's new behavior in "ALTER RENAME TABLE" introduced in version 3.25.0 (https://www.sqlite.org/changes.html). In this new behavior, when renaming a table, SQLite would automatically update all the views and triggers referencing to it, which is nice if an app is always using 3.25 or later. However, in practice, almost all android apps have to support older android versions where this behavior is not supported, apps just can't rely on this feature. Other downsides of the new behavior (in the context of android ecosystem) includes: - Because the new behavior would crash an app when a rename would cause a dangling view or trigger *even when the app does have a fix-up step after ALTER RENAME TABLE* in which case it'd just work fine at the end, it is very risky to enable the new behavior on all apps. - This new behavior also means existing upgrade steps (which may have been introduced years ago) could suddenly fail, if the step is executed in R. This means, if an app used an "ALTER TABLE RENAME" in the upgrade step from ver 1 to ver 2 five years ago and never after, and almost all users are already running ver 2 or newer, *if* there's still a user who are on ver 1, upgrading the app to the latest version could suddenly fail on R. Applications wishing to enable the new behavior can enable it at runtime with the following call: SQLiteDatabase db = ....; // open a DB db.execPerConnectionSQL("PRAGMA legacy_alter_table = 0;", null); Test: atest SQLiteSecurityTest Bug: 147928666 Change-Id: I64546deebd3782ed685fcb46498bc487e0f8d5b6
2020-04-29Fix CVE-2019-13734，CVE-2019-13751，CVE-2019-13752, CVE-2019-13753 am: ↵Zim
0f62c1a0e8 am: 5c264f7964 Change-Id: Iec55434503797129a187359c2b6fe2fa2844c8f5
2020-04-29Fix CVE-2019-13734，CVE-2019-13751，CVE-2019-13752, CVE-2019-13753 am: ↵Zim
0f62c1a0e8 Change-Id: I35578d854bc84b87e7e4c12b4d4d495bffe1f248
2020-04-29Fix CVE-2019-13734，CVE-2019-13751，CVE-2019-13752, CVE-2019-13753Zim
Test: atest SQLiteSecurityTest Bug: b/147323008 Bug: b/147322738 Bug: b/147320136 Bug: b/147320314 Change-Id: If441c59e4b6d0965def51e3717c06a4e5739ebd3
2020-02-10Merge "Revert "Revert "Turn off the new pass manager due to miscompile""" ↵Automerger Merge Worker
am: 3e4e6f7d41 am: 5df6d01fec am: 3f98707bc1 Change-Id: I21bfd9a1dab0955c3bb77857ce132358586ebd45
2020-02-10Merge "Revert "Revert "Turn off the new pass manager due to miscompile""" ↵Automerger Merge Worker
am: 3e4e6f7d41 am: 5df6d01fec Change-Id: Ie73891e845171fd5f8fb646361c6f64e0f5f3142
2020-02-10Merge "Revert "Revert "Turn off the new pass manager due to miscompile""" ↵Automerger Merge Worker
am: 3e4e6f7d41 Change-Id: Id515251a4915b650c42f462038636a6fc48c31f7
2020-02-10Merge "Revert "Revert "Turn off the new pass manager due to miscompile"""Treehugger Robot
2020-02-10Revert "Revert "Turn off the new pass manager due to miscompile""Chih-hung Hsieh
This reverts commit 10ed3ddd93df3472816560c7c15c92e540cce7f1. Reason for revert: problem found in clang-r377782 Bug: 149157191 Change-Id: I20cde351f44d241c5c65f9cfbfbb37d45c15f724
2020-02-05[automerger skipped] Merge "DO NOT MERGE - Skip QQ1A.200205.002 in master" ↵Automerger Merge Worker
am: c7647916f0 am: 58bf68549b am: ff82d5a26d -s ours am skip reason: subject contains skip directive Change-Id: Id3946326d64e627147908e8b7c8b51af5e3a846c
2020-02-05[automerger skipped] DO NOT MERGE - Skip QQ1A.200205.002 in master am: ↵Automerger Merge Worker
a35f3b7b70 am: 2fa69db0f1 am: 4268a23d67 -s ours am skip reason: subject contains skip directive Change-Id: I26dcc3430b6a04ba6121c888399ce1e3f2b2219d
2020-02-05Merge "DO NOT MERGE - Skip QQ1A.200205.002 in master" am: c7647916f0 am: ↵Automerger Merge Worker
58bf68549b Change-Id: I221cab23368a8dae7e655580bda948b2841703da
2020-02-05DO NOT MERGE - Skip QQ1A.200205.002 in master am: a35f3b7b70 am: 2fa69db0f1Automerger Merge Worker
Change-Id: I8a1849620bb61eaa981446ab7ae126f7b12e5a2e
2020-02-05Merge "DO NOT MERGE - Skip QQ1A.200205.002 in master" am: c7647916f0Automerger Merge Worker
Change-Id: I2632b3063a7e598b8de066eec073978f61aa5bea
2020-02-05DO NOT MERGE - Skip QQ1A.200205.002 in master am: a35f3b7b70Automerger Merge Worker
Change-Id: Ia9d17329033f21a3b49de5ea7139e5a3317ed79b
2020-02-05Merge "DO NOT MERGE - Skip QQ1A.200205.002 in master"Treehugger Robot
2020-02-05DO NOT MERGE - Skip QQ1A.200205.002 in masterXin Li
Bug: 147428392 Change-Id: Ic9aec543031c0fd114aec2d966baed3a02529e3d
2020-01-22[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist ↵Automerger Merge Worker
directory" into pi-dev am: 3495381899 -s ours am: be7f12d7d4 am: c560d2a745 am: 89adcd3693 -s ours am skip reason: subject contains skip directive Change-Id: I1e0aab6a2152af61271f7bb213e9d247c5e28250
2020-01-22[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist ↵Automerger Merge Worker
directory" into pi-dev am: 3495381899 -s ours am: be7f12d7d4 am: c560d2a745 Change-Id: Id86b73ed11be3d3292269b3a8b2022fccd9151df
2020-01-22[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist ↵Automerger Merge Worker
directory" into pi-dev am: 3495381899 -s ours am: be7f12d7d4 Change-Id: Ic9fa325a805b87948405bdcd668455c15c036273
2020-01-22[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist ↵Automerger Merge Worker
directory" into pi-dev am: 3495381899 -s ours am skip reason: subject contains skip directive Change-Id: I95a19f18800c57775d86eaa2c46e7d5aa93b9a62
2020-01-22Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist directory" into pi-devBryan Ferris
2020-01-10[RESTRICT AUTOMERGE] Apply Android.patch to dist directoryBryan Ferris
Test: atest SQLiteDatabaseTest Bug: 140181188 Bug: 140180629 Bug: 140182003 Change-Id: I11031f94035f33dcee6bf4c6cf593277221aea29
2020-01-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to ↵Automerger Merge Worker
sqlite 3.18" into oc-dev am: 715dc1c018 am: 53b6567859 am: 673358d13e -s ours am: e4eea4d06d -s ours am: ce4aee1bc9 am: 9b1da0fec2 am: 09bf366865 -s ours am skip reason: subject contains skip directive Change-Id: I15107c1f0084e2f96ac315a6887b599e4842c61b
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am: a42ab2b18a am: 1969c9c3d1 -s ours am: 2de507f85f -s ours am: 6a3aab6cdd am: 351819c0ef am: 8db18c777e -s ours am skip reason: subject contains skip directive Change-Id: I8b7435692f052b3a5bb06aa05c9cd59be2334eb8
2020-01-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to ↵Automerger Merge Worker
sqlite 3.18" into oc-dev am: 715dc1c018 am: 53b6567859 am: 673358d13e -s ours am: e4eea4d06d -s ours am: ce4aee1bc9 am: 9b1da0fec2 Change-Id: Id242fa4517a6e9922f1f404de175cefc6f187339
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am: a42ab2b18a am: 1969c9c3d1 -s ours am: 2de507f85f -s ours am: 6a3aab6cdd am: 351819c0ef Change-Id: Id7db7cff6761b6ce03bfc966b4d011184eceebe0
2020-01-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to ↵Automerger Merge Worker
sqlite 3.18" into oc-dev am: 715dc1c018 am: 53b6567859 am: 673358d13e -s ours am: e4eea4d06d -s ours am: ce4aee1bc9 Change-Id: I4db05a112b607c0d58d05e6a5dd9adfaab8cbd8f
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am: a42ab2b18a am: 1969c9c3d1 -s ours am: 2de507f85f -s ours am: 6a3aab6cdd Change-Id: I86bd2343b92ed025e966b323c6ac42f047970e1a
2020-01-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to ↵Automerger Merge Worker
sqlite 3.18" into oc-dev am: 715dc1c018 am: 53b6567859 am: 673358d13e -s ours am: e4eea4d06d -s ours am skip reason: subject contains skip directive Change-Id: Ib809c117c6a6721265f15dde3ba3e1fa688eb6c1
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am: a42ab2b18a am: 1969c9c3d1 -s ours am: 2de507f85f -s ours am skip reason: subject contains skip directive Change-Id: I331d9906322faf2d24a3a6d96d43ac258a26b708
2020-01-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply security patch to ↵Automerger Merge Worker
sqlite 3.18" into oc-dev am: 715dc1c018 am: 53b6567859 am: 673358d13e -s ours am skip reason: subject contains skip directive Change-Id: I90a30aa2bf6bd1f3cdc6fa78ff71e1e8aaed2b49
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am: a42ab2b18a am: 1969c9c3d1 -s ours am skip reason: subject contains skip directive Change-Id: I22405b55bef2aa9893815008a489e44a995cbe36
2020-01-09Merge "[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18" into oc-dev ↵Automerger Merge Worker
am: 715dc1c018 am: 53b6567859 Change-Id: I4ce808eed8dfe19be50eee71c997bd944b803441
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am: a42ab2b18a Change-Id: Ib1e7810ad82471dff600288c736d22d4d2b471f8
2020-01-09Merge "[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18" into oc-dev ↵Automerger Merge Worker
am: 715dc1c018 Change-Id: I5687acbe1c556a4c02fa2c559334f104f610d1b3
2020-01-09[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.18 am: 9c46de648a -s ours am skip reason: skipped by user bferris Change-Id: I9e70814ac9e754b34cbea5ce93b4c4fcdbd1f5fb
2020-01-08[automerger skipped] resolve merge conflicts of ↵Automerger Merge Worker
9c46de648a547bf82dc1edebc589cc09362d3432 to oc-dr1-dev am: 662da964e5 -s ours am: f81fd097ba am: 0f11c34288 am: f8b5d24254 am: ef7230a6d5 am: 5b2e74dca8 Change-Id: I9f4b081ef02f830bf90b6d156bcdd105b8485446
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 04:58:10 +0000