summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 Change-Id: I4449f23bc771da749c1f808d49383dd5546b45c1
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 Change-Id: Ia38f03d7a3078da71a5507252bcfa05a77fbb40c
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 Change-Id: I0a93e746a0ef0d6f8baee9626d777588a6e9b3be
2020-01-08[automerger skipped] resolve merge conflicts of ↵Automerger Merge Worker
9c46de648a547bf82dc1edebc589cc09362d3432 to oc-dr1-dev am: 662da964e5 -s ours am: f81fd097ba Change-Id: I193f208ae01aebfeab234c8e1a4601c641a56106
2020-01-08[automerger skipped] resolve merge conflicts of ↵Automerger Merge Worker
9c46de648a547bf82dc1edebc589cc09362d3432 to oc-dr1-dev am: 662da964e5 -s ours am skip reason: skipped by user bferris Change-Id: I6eba9277d09e512d664b11447b9111c1a545198d
2019-12-18Merge cherrypicks of [9943992, 9944684, 9944054, 9943993, 9944476, 9942363, ↵android-build-team Robot
9942364, 9942365, 9942367, 9944685, 9944686, 9943217, 9944762, 9944764, 9944481, 9944411, 9944055, 9944056, 9944057] into qt-qpr1-release Change-Id: Ie9174660cefaae1c45b2be9ded39b65386bcafa4
2019-12-18Apply security patch to sqlite 3.22Zim
This patch fixes CVE-2019-9936，CVE-2019-5018，CVE-2019-8457 in b/140181188 b/140180629 and b/140182003 respectively Download from https://www.sqlite.org/src/info/68b898381ac29429 Get the Tarball or ZIP Archive, unzip it on linux machine then run: mkdir bld; cd bld; ../configure; make sqlite3.c Copy sqlite3.c, sqlite3.h, sqlite3ext.h, shell.c from bld directory to dist/orig. dist contains a copy of dist/orig, but with the Android.patch file applied. Test: select sqlite_version() - returns 3.22.0 Test: atest cts/SQLiteDatabaseTest all passed. Bug: 140181188 Bug: 140180629 Bug: 140182003 Merged-In: Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c Change-Id: I9ff4875099ae9a215fcba5b19d46845c461467cc (cherry picked from commit 678cc662682a24c7c8505794fe5cc26407b646b9)
2019-12-13resolve merge conflicts of 9c46de648a547bf82dc1edebc589cc09362d3432 to ↵Bryan Ferris
oc-dr1-dev Bug: 140181188 Bug: 140180629 Bug: 140182003 Test: I solemnly swear I tested this conflict resolution. Merged-In: Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f Change-Id: I8c64562a64f54ea000473a8f2d887f26df81812c
2019-12-12[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.22 am: 8e199cf3c1 -s ours am skip reason: subject contains skip directive am: 678e532adb am: 4501a2f914 am: 6be2d00a48 am: 22ec1f0e73 -s ours am skip reason: subject contains skip directive Change-Id: If02648f427650e5e3d979c3485ddfb4d378fde75
2019-12-12[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.22 am: 8e199cf3c1 -s ours am skip reason: subject contains skip directive am: 678e532adb am: 4501a2f914 am: 6be2d00a48 Change-Id: Ibd0e9f3516ee215861d45c98b58ae69d5e9de2fd
2019-12-12[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.22 am: 8e199cf3c1 -s ours am skip reason: subject contains skip directive am: 678e532adb am: 4501a2f914 Change-Id: I3ca305d50dcfafb4afa12ebf7234fa269b275c53
2019-12-12[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.22 am: 8e199cf3c1 -s ours am skip reason: subject contains skip directive am: 678e532adb Change-Id: I13e01310ab528d64e172c428f34ea3e45337b46e
2019-12-12[automerger skipped] [RESTRICT AUTOMERGE] Apply security patch to sqlite ↵Automerger Merge Worker
3.22 am: 8e199cf3c1 -s ours am skip reason: subject contains skip directive Change-Id: Ifa9e6b73b3d4837adaf7a78026d3cb34ebfcdca9
2019-12-12[automerger skipped] Merge "Apply security patch to sqlite 3.22" into qt-dev ↵Automerger Merge Worker
am: 0ed0473a14 am: ca28674bfe am: ac4fb0ebc3 -s ours am skip reason: Change-Id Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c with SHA-1 880009beef is in history am: a68e10cf35 -s ours am skip reason: Change-Id Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c with SHA-1 880009beef is in history Change-Id: I3d081de6e6f500c75388f8aee9ce574e5a2416e7
2019-12-12[automerger skipped] Merge "Apply security patch to sqlite 3.22" into qt-dev ↵Automerger Merge Worker
am: 0ed0473a14 am: ca28674bfe am: ac4fb0ebc3 -s ours am skip reason: Change-Id Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c with SHA-1 880009beef is in history Change-Id: I214f5bccba0773c883f4c9e21e250c8d54d175d6
2019-12-12Merge "Apply security patch to sqlite 3.22" into qt-dev am: 0ed0473a14 am: ↵Automerger Merge Worker
ca28674bfe Change-Id: I43f0abd8a73b059adbf207204137de7cb6feceb5
2019-12-12Merge "Apply security patch to sqlite 3.22" into qt-dev am: 0ed0473a14Automerger Merge Worker
Change-Id: Id35fdb20b4584e854f7f9523a65f6b046d081130
2019-12-11Merge "Apply security patch to sqlite 3.22" into qt-devBryan Ferris
2019-12-11[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.22Zim
This patch fixes CVE-2019-9936，CVE-2019-5018，CVE-2019-8457 in b/140181188 b/140180629 and b/140182003 respectively Download from https://www.sqlite.org/src/info/68b898381ac29429 Get the Tarball or ZIP Archive, unzip it on linux machine then run: mkdir bld; cd bld; ../configure; make sqlite3.c Copy sqlite3.c, sqlite3.h, sqlite3ext.h, shell.c from bld directory to dist/orig. dist contains a copy of dist/orig, but with the Android.patch file applied. Test: select sqlite_version() - returns 3.22.0 Test: atest cts/SQLiteDatabaseTest all passed. Bug: 140181188 Bug: 140180629 Bug: 140182003 Change-Id: Ib500af90bcb7c29db6bd30574264831001bc9a3d
2019-12-11Merge "[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18" into oc-devBryan Ferris
2019-12-11[RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18Zim
This patch fixes CVE-2019-9936，CVE-2019-5018，CVE-2019-8457 in b/140181188 b/140180629 and b/140182003 respectively Download from https://www.sqlite.org/src/info/b54aa18b0fe4d683 Get the Tarball or ZIP Archive, unzip it on linux machine then run: mkdir bld; cd bld; ../configure; make sqlite3.c Copy sqlite3.c, sqlite3.h, sqlite3ext.h, shell.c from bld directory to dist/orig. dist contains a copy of dist/orig, but with the Android.patch file applied. Test: select sqlite_version() - returns 3.18.2 Test: atest cts/SQLiteDatabaseTest all passed. Bug: 140181188 Bug: 140180629 Bug: 140182003 Merged-In: Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f Change-Id: Idab253d25374ef6c60e753086d9d8ba12f365697
2019-12-11Apply security patch to sqlite 3.22Zim
This patch fixes CVE-2019-9936，CVE-2019-5018，CVE-2019-8457 in b/140181188 b/140180629 and b/140182003 respectively Download from https://www.sqlite.org/src/info/68b898381ac29429 Get the Tarball or ZIP Archive, unzip it on linux machine then run: mkdir bld; cd bld; ../configure; make sqlite3.c Copy sqlite3.c, sqlite3.h, sqlite3ext.h, shell.c from bld directory to dist/orig. dist contains a copy of dist/orig, but with the Android.patch file applied. Test: select sqlite_version() - returns 3.22.0 Test: atest cts/SQLiteDatabaseTest all passed. Bug: 140181188 Bug: 140180629 Bug: 140182003 Merged-In: Idf38a3adace9f4bd4feab4012c9cc4de3a1c501c Change-Id: I9ff4875099ae9a215fcba5b19d46845c461467cc
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 7b99e6b148 am: 1ae5e5d3e2Automerger Merge Worker
Change-Id: Ifd6695c00186241486db7948a231dcf9aa690bae
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 7b99e6b148Xin Li
am: 4ad971b99c Change-Id: Ic93cfc2f65ab5d39ed0592edd2c4d15024c46916
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"Xin Li
am: 7b99e6b148 Change-Id: I5889bcc7ee71e47fbc64a89c5c804df535091ef5
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"Treehugger Robot
2019-12-02Merge Android10 QPR1 into AOSP masterXin Li
Bug: 145570283 Change-Id: I0dbf7789e4872220eb549b079014e3ebdd83b65c
2019-10-31[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: a41beb36bb am: e2562d6dc7 -s ours am skip reason: subject contains skip directive Change-Id: Iad4a81567f03c3cb92b0c0375d854c5d5f67ac21
2019-10-31DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: a41beb36bb Change-Id: I4405b8e7615c5d67e93725e4b8546da6a7ee57cc
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Id3f67c88e2d8c7b47dab2848b7dd553cad3e8072
2019-10-05Merge "Revert "Turn off the new pass manager due to miscompile"" am: ↵Yi Kong
9841f55a7e am: c90342c9fe am: df916769a3 am: 131f6b2422 Change-Id: I9c1f9f1e403ea87ccbc9e6ba31997071d4aa2578
2019-10-05Merge "Revert "Turn off the new pass manager due to miscompile"" am: ↵Yi Kong
9841f55a7e am: c90342c9fe am: df916769a3 Change-Id: I796509d0a204a066254d3c91e7902fb30047fc8c
2019-10-05Merge "Revert "Turn off the new pass manager due to miscompile"" am: 9841f55a7eYi Kong
am: c90342c9fe Change-Id: I5e00ec33f8d8bff3453c29a7a99c991f91e5e189
2019-10-05Merge "Revert "Turn off the new pass manager due to miscompile""Yi Kong
am: 9841f55a7e Change-Id: Ice0ab37a5fc20b2bc471688746ac7b8497265fb7
2019-10-05Merge "Revert "Turn off the new pass manager due to miscompile""Treehugger Robot
2019-10-05Revert "Turn off the new pass manager due to miscompile"Yi Kong
This reverts commit 2c322e71fe66db569c4d651f2abf8a1c0c57d3e2. The miscompile is fixed by the latest compiler update. Test: manual Bug: 131854833 Exempt-From-Owner-Approval: Revert
2019-09-11Snap for 5867030 from 37b5b03fbe98e8f736f89b3a48e2cd01762cf6d5 to ↵android-build-team Robot
qt-qpr1-release Change-Id: I5a5dd15f09805c821c9c8a842e4b6c08d3086ed9
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 am: e0c0690ea2 am: 37b5b03fbe am: 63170e9535 Change-Id: I078afeea0dd7db253a0c435a862cd28cf41f402b
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 am: e0c0690ea2 am: f8625cfe71 am: 01c63e75fc Change-Id: Iec7f430640b420d75aa238bcbc834e96ff146e81
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 am: e0c0690ea2 am: 37b5b03fbe Change-Id: Id0fe5e5eccea31e80f3bfb42e810bdc13f2a8b53
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 am: e0c0690ea2 am: f8625cfe71 Change-Id: I1a87cdbd99a4609ba377155cf8d772051e20b67f
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 am: e0c0690ea2 Change-Id: I9cdb83e3b80b2a03427191fb73a10d71b13ac4a6
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 am: e0c0690ea2 Change-Id: I3cb565cd1575e46c0001b66c12803bdaad813006
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 am: 59929184e2 Change-Id: Ib6ed9f9591e9e1e2d925803fd848b8e5e60ccd84
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28e am: ↵Nick Kralevich
7b05fb2676 am: 58740f2f19 Change-Id: Ia6688782c45b96f7fe5f746e24899cf327013a91
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222a am: 48926ec28eNick Kralevich
am: 7b05fb2676 Change-Id: Idb5e3619af8791af01b50f6c8cee6a1a3d296a52
2019-09-10sqlite3_android.cpp: disable _TOKENIZE am: 2f967a222aNick Kralevich
am: 48926ec28e Change-Id: Ic9ac1bb5fc7c6576d9c953809e0ae3358a12d61e
2019-09-10sqlite3_android.cpp: disable _TOKENIZENick Kralevich
am: 2f967a222a Change-Id: I48ed57d6135a0d3da760ab528c0f9edc5a122021
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2e62e531e5 -s ours am: ee0474ead8 -s ours am: 6408049fcc -s ours am skip reason: change_id I0f6fc526e80c5b9c7c69322eb515472954619817 with SHA1 a6a4a96fd1 is in history Change-Id: I9337459a770e8f4fea9f7a6e9597a9c46e05bb60
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2e62e531e5 -s ours am: ee0474ead8 -s ours am skip reason: change_id I0f6fc526e80c5b9c7c69322eb515472954619817 with SHA1 a6a4a96fd1 is in history Change-Id: Ib4d1247881aba3011bd23e792b498d3cc63b04db
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 10:43:27 +0000