summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from 7415528a1df22d393fbaabb7bcf4df5883d5df3e to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I5ede50b50b8057444d202e3fb5f9e0fa3465dfa5
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-18Snap for 7152399 from 03d32fc03ebc226a8a7c07e999602b6da6d5a645 to sc-d1-releaseandroid-build-team Robot
Change-Id: Icd67798c97845e2c1a0073e7d62668099636dc4d
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-03Snap for 7119974 from 9e977cd94f4fa31f6ed6b463123a4bea4b7d2330 to sc-d1-releaseandroid-build-team Robot
Change-Id: I03249eed7fbbb6f7a8b10066624a41cd86974ac5
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-25Snap for 6993940 from 69af043bf8e379078322a3662a952bd2a3cdde24 to sc-d1-releaseandroid-build-team Robot
Change-Id: Idc7492abd5a9b430113468ce3448a14c1b33a7bf
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-11Snap for 6964888 from 0033cfbf92f4dae9c8d2571133f6b81bf73442b6 to sc-d1-releaseandroid-build-team Robot
Change-Id: I23ba3b87dc0d69e95f877d38c419a9ad1ce683ed
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-14Snap for 6832314 from 3c61cc6d643af314271f735762513895105f1ae7 to sc-d1-releaseandroid-build-team Robot
Change-Id: If81589ade43be51148dbab96a1a9f77171f530d1
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 am: b7a5507956 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dng_sdk/+/11464172 Change-Id: I7bfd1b41d655ae3608c91fb472c6464162ad0132
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-08Snap for 6660068 from a8cce9d43de7b2ff33e8786f48423e69f39c53ca to sc-d1-releaseandroid-build-team Robot
Change-Id: I75256a2e6ae213a9f3f5e11fe5f9b94d60f3076a
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: e252d6e63c Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363 Change-Id: I9fe9dd5abf0f062d44e6c104e6d10abdb13e5c01
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-17Snap for 6502590 from ab2dc95ddbd36312b356dc3d26b0f2372fc09535 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ida8ee062e3597cd6befc4b6580356e173b739c5c
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: e84d9971f9 -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: I97a2cc641b6afeee7df60ea0f1ca49bcff178a12
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: 26c16dddf8 -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 8051967ac1 is in history Change-Id: I6ea58934f8af9d2b60dff00342586fd0dc031f97
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: a3a89a2c0a am: b6815a19d1 am: 221ebf384e -s ours am: 64cc57bcde -s ours am skip reason: Change-Id I380c158e465a995a5b0f88021cbf10bbf050db00 with SHA-1 ff80ee8239 is in history Change-Id: Id3a1ef36e328a71062a7f0bf2fe61361a70c5794
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 08:14:28 +0000