summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: 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: 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: 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 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-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 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 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: 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-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
2020-05-05Add METADATA to dng_sdk: Apache2=NOTICE am: 451a6aed89 am: 3ad1308e09 am: ↵Bob Badour
d8d953d544 am: 4861c3cf30 Change-Id: I1a602b54666ed3f6d00425bea9e1c96917fdc56b
2020-05-05Add METADATA to dng_sdk: Apache2=NOTICE am: 451a6aed89 am: 3ad1308e09 am: ↵Bob Badour
d8d953d544 Change-Id: Ie8876d43fd3e21a8c32737f2b563450957d77d2b
2020-05-05Add METADATA to dng_sdk: Apache2=NOTICE am: 451a6aed89 am: 3ad1308e09Bob Badour
Change-Id: I64be568da17621029cebd7944cfd023a0181cddf
2020-05-05Add METADATA to dng_sdk: Apache2=NOTICE am: 451a6aed89Bob Badour
Change-Id: I5512cc7798d0cb4c67c67c56917d502977f16856
2020-04-29Add METADATA to dng_sdk: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ide5f0bcced26e124c3bc1ed8d61f9905a52f8cdd
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 5b891107e7 -s ours am: 83c9adf1b5 am: 3ec05d4e3a Change-Id: I1fcb54877239889e36d20c52b55afd7638ae18f5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 5b891107e7 -s ours am: 83c9adf1b5 Change-Id: Ia776b8bf170b8294459056ee9b0ea0e5c4d27143
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 5b891107e7 -s ours am skip reason: subject contains skip directive Change-Id: I09cf2d65dbc4dd678c86b02e6664581efe2947ba
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I46b359a86f2337766dec5da4c475a177cad6f99c
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 61ec872de7 -s ours am: 54fbdae9f6 am: f8eec85ee6 Change-Id: I9364f94127c3daa7fdaae2c6bc563a00bf90287f
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 61ec872de7 -s ours am: 54fbdae9f6 Change-Id: Ifae56f0ada37fe2040c0dfa8558e1b0dd2967b23
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 61ec872de7 Change-Id: I3fe874bcb1c4825d60569ad78447f8dbca066f5d
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 61ec872de7 -s ours am skip reason: subject contains skip directive Change-Id: I3d70059c76e57029f9245b554b7a2713867ca7e6
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I5039a1306dd107f1a5d52596009c08613f383d73
2020-02-27Remove deprecated mac API from dng_date_time.cpp am: 50f6082727 am: ↵Automerger Merge Worker
bf24c2ce51 am: fd1be0332e am: bc414c54e0 Change-Id: I78965119f6141836219c6ae10fde597559246195
2020-02-27Remove deprecated mac API from dng_date_time.cpp am: 50f6082727 am: ↵Automerger Merge Worker
bf24c2ce51 am: fd1be0332e Change-Id: I2c8e6e5286761f78a3710d00b0b16a8ae0642c6c
2020-02-27Remove deprecated mac API from dng_date_time.cpp am: 50f6082727 am: bf24c2ce51Automerger Merge Worker
Change-Id: I4f76dd8cc195a1763630617835b8e8b4c691f9d2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 04:15:48 +0000