summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ecabd93fc5 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: b77800dd7f -s ours am: 7415528a1d -s ours am skip reason: Change-Id I7e68f0a1a3e43552d24876b50b7447e14517c85f with SHA-1 a1abdf3186 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ice546ff16856775f055441fa6311ba9a7b675f8a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ecabd93fc5 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1Xin Li
ours am: b77800dd7f -s ours am skip reason: Change-Id I7e68f0a1a3e43552d24876b50b7447e14517c85f with SHA-1 a1abdf3186 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1c58164c3bcd052e4060733bf9e5c3f1fe72c834
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ecabd93fc5 -s oursXin Li
am skip reason: Change-Id I7e68f0a1a3e43552d24876b50b7447e14517c85f with SHA-1 a1abdf3186 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icfdb54ee8c73652f6238bc40bac9f52e66ccd934
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I7e68f0a1a3e43552d24876b50b7447e14517c85f Change-Id: I212fcbcd5b8e5dd37e9cbd436c0b37f12aa036be
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dng_sdk am: b3b5f20cda am: ↵Bob Badour
5e70f49369 am: 0b13afd2df am: 03d32fc03e Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1588224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0347f2851e65436067916f8f19fb7642b828c00b
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dng_sdk am: b3b5f20cda am: ↵Bob Badour
5e70f49369 am: 0b13afd2df Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1588224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I640cf04568a1cbb7336ad24bcfb12c19872bc386
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dng_sdk am: b3b5f20cda am: 5e70f49369Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1588224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c719860377302b395f9a93843577b40c4d9e75d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dng_sdk am: b3b5f20cdaBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1588224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d7702fcff7afe1e3bbb0efb0d79e472274b7c65
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/dng_sdkandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT legacy_by_exception_only to: Android.bp Added SPDX-license-identifier-MIT legacy_by_exception_only to: fuzzer/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I61d48f662fbe336ecef7adc8e431e5f0311e5473
2021-02-02Fix license_type. Adobe license. am: 85e6336c82 am: 5f2b6c840a am: ↵Bob Badour
f736f9b196 am: 9e977cd94f Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1556520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie15234e8f7e97ada63a159195f91899496311b3b
2021-02-02Fix license_type. Adobe license. am: 85e6336c82 am: 5f2b6c840a am: f736f9b196Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1556520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I55695d9f9bcf45d597254f7026cf0bc6d1ffaa06
2021-02-02Fix license_type. Adobe license. am: 85e6336c82 am: 5f2b6c840aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1556520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19814f1ba6f3f82b7d4544219d7cabbebc71ecb0
2021-02-02Fix license_type. Adobe license. am: 85e6336c82Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1556520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80b5d93bc8f988acac0f3f2e7f6bd7468c20de59
2021-01-24Fix license_type. Adobe license.Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I840567c1356fef70c19d0e287caf263fdeac75dd
2020-11-24Mark ab/6881855 as merged am: 5190a0e678 am: a1abdf3186Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dng_sdk/+/13112600 Change-Id: I694617724fd4fde176c56aa3f4e85db34cce0d40
2020-11-24Mark ab/6881855 as merged am: 5190a0e678Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dng_sdk/+/13112600 Change-Id: I7e68f0a1a3e43552d24876b50b7447e14517c85f
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I58c017524a1349c15c38ede65233da3e742375cb
2020-11-10Add a fuzz target to test DNG image parsing in dng_sdk. am: 0c2c0ca07a am: ↵Eugene Rodionov
49be9325f2 am: f4e068b00e am: a139e98c85 Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1487679 Change-Id: I46c50dbe7f3126cc5c524b65bfd30689bc1c8e1f
2020-11-10Add a fuzz target to test DNG image parsing in dng_sdk. am: 0c2c0ca07a am: ↵Eugene Rodionov
49be9325f2 am: f4e068b00e Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1487679 Change-Id: If8b5c82874c353315bcf6b8a9147141f00777fc5
2020-11-10Add a fuzz target to test DNG image parsing in dng_sdk. am: 0c2c0ca07a am: ↵Eugene Rodionov
49be9325f2 Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1487679 Change-Id: Ibb9abf8881e295bd58423d201bc7e6ee0540f0c2
2020-11-10Add a fuzz target to test DNG image parsing in dng_sdk. am: 0c2c0ca07aEugene Rodionov
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1487679 Change-Id: I24fc284ebb9f7a28756724b51683505ef32ad891
2020-11-05Add a fuzz target to test DNG image parsing in dng_sdk.Eugene Rodionov
This fuzz target aims at `dng_read_image::ReadLosslessJPEG` to do variant analysis for CVE-2020-9589 (b/156261521). Test: # To run fuzzer on the host do: Test: source build/envsetup.sh && \ Test: lunch aosp_x86_64-eng && \ Test: SANITIZE_HOST=address make dng_parser_fuzzer && \ Test: LD_LIBRARY_PATH=out/host/linux-x86/fuzz/x86_64/lib/ \ Test: out/host/linux-x86/fuzz/x86_64/dng_parser_fuzzer/dng_parser_fuzzer Change-Id: I2f71abbbc97e35a409a3843c7c4462d6e5c40ee5
2020-09-13Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: f0ff5a6b46 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dng_sdk/+/11464172 Change-Id: Ib181022cad844fdf9b1c2c015723d7b85a5de7a2
2020-07-07[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 84de511df4 am: b138d759f5 -s ours am: bf7020b680 am: e4e62e523c am: 0cff1e151f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363 Change-Id: I5962dd3b2328aef9352ee59e53fc3292a0591233
2020-07-07[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 84de511df4 am: b138d759f5 -s ours am: bf7020b680 am: e4e62e523c Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363 Change-Id: Ie2f81b0e175d975f4eb39315f5a30840275789eb
2020-07-07[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 84de511df4 am: b138d759f5 -s ours am: bf7020b680 Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363 Change-Id: Id1214838d1f66b0ab56b05d9b4edbd6c0378f0f4
2020-07-07[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 84de511df4 am: b138d759f5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363 Change-Id: I650598f6ae247634403a067af179c06656e87bda
2020-07-07Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 84de511df4Bill Yi
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363 Change-Id: Id88dd610ddd0e67099fbe5f276bce9d215b2e505
2020-07-07Merge android10-qpr3-release to aosp-master - DO NOT MERGEandroid-r-beta-3android-r-beta-2Bill Yi
Change-Id: If3da1da3581e3bb66d6ce6472684c2dcf3504eca
2020-05-17Merge cherrypicks of [11520371, 11520372, 11521176, 11521177, 11520373, ↵android-10.0.0_r41android-10.0.0_r40android10-qpr3-releaseandroid-build-team Robot
11520374, 11521196, 11521216, 11520730, 11521236, 11520430, 11521256, 11521276, 11520277, 11520278] into qt-qpr3-release Change-Id: I76e197d1b55ff1812ee8650a2a716d65f59526d5
2020-05-17Targeted minimal fix for security issue in CVE-2020-9589.Z Stern
Bug: 156261521 Test: If0722deb96def186fcd0a2d97e57647a1b5987f8 Change-Id: I380c158e465a995a5b0f88021cbf10bbf050db00 Merged-In: I380c158e465a995a5b0f88021cbf10bbf050db00 (cherry picked from commit 8051967ac143c7e07ee636315cee8b56874e22c3)
2020-05-15[automerger skipped] Targeted minimal fix for security issue in ↵Z Stern
CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: 7ec1a5c170 -s ours am: 1d987e05ae -s ours am: e5fef65c0e -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: I1e14af5e9cc436d283742e5cccd122115fe14804
2020-05-15[automerger skipped] Targeted minimal fix for security issue in ↵Z Stern
CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: 7ec1a5c170 -s ours am: 1d987e05ae -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: I8014776bdee52eb955aae80c8f22b60b5e9daddd
2020-05-15[automerger skipped] Targeted minimal fix for security issue in ↵Z Stern
CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a am: 83d8927777 -s ours am: 3b0a17bd2d -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: Ib52886adc70888cdf3a1b4787c82434d2cc4c4a9
2020-05-15[automerger skipped] Targeted minimal fix for security issue in ↵Z Stern
CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a am: 83d8927777 -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: I942e27f9682b005b16481ca13cd2648954dbe13b
2020-05-15[automerger skipped] Targeted minimal fix for security issue in ↵Z Stern
CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a am: b6815a19d1 am: 221ebf384e -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 ff80ee8239 is in history Change-Id: I445747f0823f2750b5021471286196ad2e5f6728
2020-05-15[automerger skipped] Targeted minimal fix for security issue in ↵Z Stern
CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: 7ec1a5c170 -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: I8598f054b2c4ae4eed521cd4839b2b4ceef6f9ba
2020-05-15Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c Change-Id: Ifcae8bff01a3c351371e5fac9b4957ab3222c68d
2020-05-15Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a Change-Id: I4fb18d851108cb80a8c4867e90e77b4d4ff0924c
2020-05-15Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a am: b6815a19d1 Change-Id: I711e9e385591fa43f84b7360a9a7f5f2e8c3bd91
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseZ Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a Change-Id: I57ff94bf0b10b161b4632c8148a2a6c8acfb70e8
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseZ Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c Change-Id: Iab8faaae567e2d61dd8ab9e31c7898a95704471c
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵android-11.0.0_r16android11-d1-b-releaseZ Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c Change-Id: I9fce0a06ddd96baca01cf3a1094dd55d272c8f93
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵android11-devZ Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c Change-Id: I062a9583a87a0b7272bfdb83057a5c96d1fe6061
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a Change-Id: I52606e67b83bf61230aaf8089e220a7a4c0653c3
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 am: 0d886a49d3 Change-Id: I7e85179f18cc445b1cbcebbec62fa3149817a643
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 am: ab47f56729 Change-Id: I2f7e5cb3225a4f6f475ab2217c04c95e4079b70e
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: ↵Z Stern
17f4b85725 Change-Id: I802d25a18c01dd363636e88157fa223143e70dd6
2020-05-14Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1Z Stern
Change-Id: Ifa5bebb1e0a14dfed16958a0710a7232db9755ff
2020-05-13Targeted minimal fix for security issue in CVE-2020-9589.Z Stern
Bug: 156261521 Test: If0722deb96def186fcd0a2d97e57647a1b5987f8 Change-Id: I380c158e465a995a5b0f88021cbf10bbf050db00 Merged-In: I380c158e465a995a5b0f88021cbf10bbf050db00
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 02:03:09 +0000