)]}' { "log": [ { "commit": "ded3553047ca571cfa30f8bb76af1bf82e2c1616", "tree": "2395cb9932eb0451264c99e543a2c60fc16a2f0f", "parents": [ "f1a6f63284bbdcc8d1357cebd9a2c94802f4fe41" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Wed Jan 15 11:19:34 2025 -0800" }, "committer": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Wed Jan 15 17:10:47 2025 -0800" }, "message": "Update Android for Rust 1.83.0\n\nerror: manually reimplementing `div_ceil`\n --\u003e system/keymint/common/src/crypto.rs:507:17\n |\n507 | let n \u003d (out_len + SHA256_DIGEST_LEN - 1) / SHA256_DIGEST_LEN;\n | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `.div_ceil()`: `out_len.div_ceil(SHA256_DIGEST_LEN)`\n |\n \u003d help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_div_ceil\n \u003d note: `-D clippy::manual-div-ceil` implied by `-D warnings`\n \u003d help: to override `-D warnings` add `#[allow(clippy::manual_div_ceil)]`\n\nTest: m out/soong/.intermediates/system/keymint/common/libkmr_common/linux_glibc_x86_64_dylib/libkmr_common.dylib.so.clippy\nBug: 384401387\nChange-Id: I4099996e78f0931b442817252b93dd8320353b67\n" }, { "commit": "f1a6f63284bbdcc8d1357cebd9a2c94802f4fe41", "tree": "a033e227daaf54641055b153cba5145083672fcb", "parents": [ "2aecf91aced00974af2ccaefad45ea04830eada8", "28e41ffd5deb882ed69a4146ec49065b6c2351a5" ], "author": { "name": "Catherine Vlasov", "email": "cvlasov@google.com", "time": "Wed Dec 04 19:08:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 19:08:45 2024 +0000" }, "message": "Remove comments on some fields in the ASN.1 schema. am: 28e41ffd5d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3380028\n\nChange-Id: I116c326a1b21644a4b90e6e8ebfe0c9164069bd0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "28e41ffd5deb882ed69a4146ec49065b6c2351a5", "tree": "a033e227daaf54641055b153cba5145083672fcb", "parents": [ "29ba069bbed4d1d91833fb13d5d4a3305fd0aea7" ], "author": { "name": "Catherine Vlasov", "email": "cvlasov@google.com", "time": "Thu Nov 28 12:49:57 2024 +0000" }, "committer": { "name": "Catherine Vlasov", "email": "cvlasov@google.com", "time": "Wed Dec 04 15:14:47 2024 +0000" }, "message": "Remove comments on some fields in the ASN.1 schema.\n\nThe AIDL interface spec is the source of truth. We should avoid\ndocumenting individual fields in two places since it\u0027s easy for\nthem to go out of sync (e.g. the comments on the version fields\nwere updated in the AIDL interface to reflect the new KeyMint\nversion (400) but the comments here weren\u0027t updated). Arguably\neven the un-commented schemas in this file could just be deleted\nbut they\u0027re still helpful for cross-referencing with the actual\nimplementation (e.g. to see the types and encoding expectations).\n\nBug: 381383980\nTest: n/a, comment update\nChange-Id: I6a1b79bcb009d8edab33c7ab6113687a24f52e93\n" }, { "commit": "2aecf91aced00974af2ccaefad45ea04830eada8", "tree": "ba690e52aa84cdd7d6b6f45b94af7d8a4b79ade3", "parents": [ "b6f14c78cb1b7e3b438ab44e5c309289bceea18a", "29ba069bbed4d1d91833fb13d5d4a3305fd0aea7" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Wed Nov 20 07:18:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 20 07:18:30 2024 +0000" }, "message": "Simplify KeyMint setAdditionalAttestationInfo impl am: 29ba069bbe\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3364331\n\nChange-Id: I038cd533127cfd3e8c4d918dbd4dad1212c8970c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "29ba069bbed4d1d91833fb13d5d4a3305fd0aea7", "tree": "ba690e52aa84cdd7d6b6f45b94af7d8a4b79ade3", "parents": [ "0fbe3609f02d423ec073c1f554531ee221bc4919" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Mon Nov 18 15:22:53 2024 +0000" }, "committer": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Tue Nov 19 17:53:15 2024 +0000" }, "message": "Simplify KeyMint setAdditionalAttestationInfo impl\n\nMake `allowed_additional_attestation_tags` a const slice instead of a\nBTreeSet \u0026 make `additional_attestation_info` a Vec instead of BTreeMap.\n\nBug: 369375199\nTest: VtsAidlKeyMintTargetTest\nChange-Id: Iebcc04473e3a051530f71ab324ae8aebfde9888f\n" }, { "commit": "b6f14c78cb1b7e3b438ab44e5c309289bceea18a", "tree": "78b05317c01519ef96118f0c80cfde4add1602c1", "parents": [ "2a61faa5b48ee65f942284b6e29a083db8386e77", "0fbe3609f02d423ec073c1f554531ee221bc4919" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Wed Nov 06 07:44:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 06 07:44:05 2024 +0000" }, "message": "Merge \"Implement setAdditionalAttestationInfo \u0026 attest to modules\" into main am: 0fbe3609f0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3328303\n\nChange-Id: I6539650d1aff373f49abd67468d233147ac33081\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0fbe3609f02d423ec073c1f554531ee221bc4919", "tree": "78b05317c01519ef96118f0c80cfde4add1602c1", "parents": [ "9563f981bd566b6e16c2c76dc63ba461bd259789", "3fff3773d40e2b5c1b3693e3dfb3be1904357ef5" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Wed Nov 06 07:09:01 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 06 07:09:01 2024 +0000" }, "message": "Merge \"Implement setAdditionalAttestationInfo \u0026 attest to modules\" into main" }, { "commit": "2a61faa5b48ee65f942284b6e29a083db8386e77", "tree": "a772342dd0da7b8408e2819addbe5b7a619d7bcb", "parents": [ "51760c626a7a62db4b5c61ae97ab7ea423e24ca9", "9563f981bd566b6e16c2c76dc63ba461bd259789" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Mon Nov 04 16:22:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 04 16:22:20 2024 +0000" }, "message": "Add cvlasov@ and kwadhera@ to OWNERS am: 9563f981bd\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3328256\n\nChange-Id: I365432d8b9fb9072157b1616165250b5cf8ce4cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9563f981bd566b6e16c2c76dc63ba461bd259789", "tree": "a772342dd0da7b8408e2819addbe5b7a619d7bcb", "parents": [ "550fa920a4a6d8ba43da3af3504050739667155b" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Fri Nov 01 22:36:11 2024 +0000" }, "committer": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Fri Nov 01 22:36:11 2024 +0000" }, "message": "Add cvlasov@ and kwadhera@ to OWNERS\n\nTest: n/a\nChange-Id: I5eb67f92f1af79594c61721229c05487b95b33e9\n" }, { "commit": "3fff3773d40e2b5c1b3693e3dfb3be1904357ef5", "tree": "4d824edeb2cc743403ca3deff1d1e23c254daa0d", "parents": [ "550fa920a4a6d8ba43da3af3504050739667155b" ], "author": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Fri Nov 01 21:23:40 2024 +0000" }, "committer": { "name": "Karuna Wadhera", "email": "kwadhera@google.com", "time": "Fri Nov 01 21:41:39 2024 +0000" }, "message": "Implement setAdditionalAttestationInfo \u0026 attest to modules\n\nBug: 369375199\nTest: Manually checked that module info is added to the attestation when\n sent via IKeyMintDevice::setAdditionalAttestationInfo.\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5a047f7ca82bc7da6e0b82af48e37913470390a7)\nMerged-In: Iea49034fcd848680beec17104b417c26865bd628\nChange-Id: Iea49034fcd848680beec17104b417c26865bd628\n" }, { "commit": "51760c626a7a62db4b5c61ae97ab7ea423e24ca9", "tree": "2ee07e48fb13f4939ad1d6a6dd05568a2891433e", "parents": [ "d6edc0eb16fadadb51fea371e0ace9f6c63af69c", "e16ee9f82d8814158aef0d3469a0876b80bb1506" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 19 07:20:10 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Oct 19 07:20:10 2024 +0000" }, "message": "Merge \"Mark 24Q4 as merged in aosp-main-future\" into aosp-main-future" }, { "commit": "d6edc0eb16fadadb51fea371e0ace9f6c63af69c", "tree": "2ee07e48fb13f4939ad1d6a6dd05568a2891433e", "parents": [ "1bbc2310e70a263a09a5f0a4f190d9be8d3b862e", "550fa920a4a6d8ba43da3af3504050739667155b" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Oct 18 00:07:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 00:07:08 2024 +0000" }, "message": "Add dirgroup for trusty genrule am: 550fa920a4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3304637\n\nChange-Id: Ia7942fb0f2b977a1f8806a88f87ccfa6883f31db\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e16ee9f82d8814158aef0d3469a0876b80bb1506", "tree": "92f0aec3521bde82d076b2a21caa0d51d10c46e4", "parents": [ "1bbc2310e70a263a09a5f0a4f190d9be8d3b862e", "54377f593eec5b9cba5d2d2d0cc4d5d7947213fa" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:39 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:39 2024 -0700" }, "message": "Mark 24Q4 as merged in aosp-main-future\n\nBug: 373937381\nMerged-In: I797438c18a9e0a9d8c26e3039805407b0c217893\nChange-Id: Ia6c06b4e3cc27c9a85cf56cae776e4e6053c8b3b\n" }, { "commit": "550fa920a4a6d8ba43da3af3504050739667155b", "tree": "2ee07e48fb13f4939ad1d6a6dd05568a2891433e", "parents": [ "bcc560126748b0be0228ddac32a35c70a935827b" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Thu Oct 10 17:15:48 2024 +0900" }, "committer": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Thu Oct 10 17:31:32 2024 +0900" }, "message": "Add dirgroup for trusty genrule\n\nBug: 358302178\nTest: m lk.elf.x86_64 lk.elf.arm64\nChange-Id: I3722b20cf29e27be97c20c61bbd4a9fef4cfd1e1\n" }, { "commit": "1bbc2310e70a263a09a5f0a4f190d9be8d3b862e", "tree": "92f0aec3521bde82d076b2a21caa0d51d10c46e4", "parents": [ "4a5a80d7dceb99842fb8c2dcf9e433c4928715d7", "bcc560126748b0be0228ddac32a35c70a935827b" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Sep 30 09:53:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 30 09:53:39 2024 +0000" }, "message": "Merge \"Update Cargo files\" into main am: bcc5601267\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3281974\n\nChange-Id: I39a1a1301d1324b2dd9c619c7ca73673e7535db9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4a5a80d7dceb99842fb8c2dcf9e433c4928715d7", "tree": "e88ba4a58b56f2b86e853669e3c6140d6ddabd93", "parents": [ "595080a9c0d15d5557899352c9053da432d537fb", "8f43b397c3e8d003b01af22642502989d80bccd9" ], "author": { "name": "Catherine Vlasov", "email": "cvlasov@google.com", "time": "Mon Sep 30 09:53:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 30 09:53:25 2024 +0000" }, "message": "Update comment for fallback Verified Boot key value. am: 8f43b397c3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3284640\n\nChange-Id: I2da0a65f97377c529015e069ac10885906fe2e72\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bcc560126748b0be0228ddac32a35c70a935827b", "tree": "92f0aec3521bde82d076b2a21caa0d51d10c46e4", "parents": [ "8f43b397c3e8d003b01af22642502989d80bccd9", "92c96dadf573bd08af570251d35ba2b035a54e56" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Sep 30 09:24:22 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 30 09:24:22 2024 +0000" }, "message": "Merge \"Update Cargo files\" into main" }, { "commit": "8f43b397c3e8d003b01af22642502989d80bccd9", "tree": "e88ba4a58b56f2b86e853669e3c6140d6ddabd93", "parents": [ "be87a4d47a92a0ab6395b61f20edeee6cbc72da6" ], "author": { "name": "Catherine Vlasov", "email": "cvlasov@google.com", "time": "Fri Sep 27 15:37:43 2024 +0000" }, "committer": { "name": "Catherine Vlasov", "email": "cvlasov@google.com", "time": "Fri Sep 27 15:42:29 2024 +0000" }, "message": "Update comment for fallback Verified Boot key value.\n\nTest: build\nChange-Id: I00cfca2f15064b2efac49f7f6f77eff166ddc884\n" }, { "commit": "595080a9c0d15d5557899352c9053da432d537fb", "tree": "ed2e408ebe02065d7045a9a7fb19d07253ef5865", "parents": [ "31726c2ff06b65d82efa5039419a85af829648b0", "be87a4d47a92a0ab6395b61f20edeee6cbc72da6" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Wed Sep 25 13:46:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 25 13:46:21 2024 +0000" }, "message": "Merge \"Move description of secure time to device section\" into main am: be87a4d47a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3281976\n\nChange-Id: I738b637edc21a38150f5d284faf8d21ab10323c1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "be87a4d47a92a0ab6395b61f20edeee6cbc72da6", "tree": "ed2e408ebe02065d7045a9a7fb19d07253ef5865", "parents": [ "d274124bab990e6e8310adf1c56782bba8c02b1a", "52dc61de18d003cc6c0c8ca104bf83a5a0d29178" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Wed Sep 25 13:23:37 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 25 13:23:37 2024 +0000" }, "message": "Merge \"Move description of secure time to device section\" into main" }, { "commit": "52dc61de18d003cc6c0c8ca104bf83a5a0d29178", "tree": "8c1885e7f1ac848d65b7c55eaa926e839c8dae6b", "parents": [ "3dcd8762b9dbacf9831148c0d17428999bf1c4bc" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Wed Sep 25 13:24:05 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Wed Sep 25 13:38:22 2024 +0100" }, "message": "Move description of secure time to device section\n\nThe trait for implementing secure time is in `kmr_common::crypto`, but\nit\u0027s not really a cryptographic trait -- it logically belongs with\ndevice-specific traits.\n\nSo move its description into that section (without changing the\nlocation of any code).\n\nAlso add trait names.\n\nTest: None\nChange-Id: Ic4b91a1ef2e6676842fb3c3a1ff970b4986fb5c6\n" }, { "commit": "92c96dadf573bd08af570251d35ba2b035a54e56", "tree": "658c520f29c89f6dfbcd1750722476e2c04162fa", "parents": [ "3dcd8762b9dbacf9831148c0d17428999bf1c4bc" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Sep 24 14:37:02 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Wed Sep 25 10:27:17 2024 +0100" }, "message": "Update Cargo files\n\nNote that these Cargo files are not supported (the official Android\nbuild system is Soong), but are sometimes convenient to have around.\n\nHowever, they are likely to get out of date and lag behind on updates,\nas here.\n\nTest: cargo build; cargo clippy\nChange-Id: Ibc8d14568f5be5435becece18d5594147f2f4359\n" }, { "commit": "54377f593eec5b9cba5d2d2d0cc4d5d7947213fa", "tree": "73cd2e8d3df5b69d523f955f7e62325c7a1541fe", "parents": [ "8547eb8c6b00975136ad31a18de3eea41243456c", "31726c2ff06b65d82efa5039419a85af829648b0" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Sep 17 11:28:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 17 11:28:02 2024 +0000" }, "message": "New legacy message for UDS cert retrieval am: d274124bab am: 31726c2ff0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3244520\n\nChange-Id: I60afbf429ca95ffbdb5ccce94bc619f38e85fc88\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "31726c2ff06b65d82efa5039419a85af829648b0", "tree": "73cd2e8d3df5b69d523f955f7e62325c7a1541fe", "parents": [ "f1a8a6bfc3f3cfa5db76188549ec5f351eb70e0a", "d274124bab990e6e8310adf1c56782bba8c02b1a" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Sep 17 11:21:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 17 11:21:15 2024 +0000" }, "message": "New legacy message for UDS cert retrieval am: d274124bab\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3244520\n\nChange-Id: I658d775ddf8c15ec003a5b843a136ab651ef8900\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d274124bab990e6e8310adf1c56782bba8c02b1a", "tree": "73cd2e8d3df5b69d523f955f7e62325c7a1541fe", "parents": [ "3dcd8762b9dbacf9831148c0d17428999bf1c4bc" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Aug 27 09:30:39 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Sep 13 11:41:00 2024 +0100" }, "message": "New legacy message for UDS cert retrieval\n\nBug: 355160637\nTest: TODO\nChange-Id: I0c8fdb1ad0dc6113bfa51d729ebe0c58831830da\n" }, { "commit": "8547eb8c6b00975136ad31a18de3eea41243456c", "tree": "73a47f458333d7dcc197c86d7acf3d9c468d4b99", "parents": [ "2846f3288897ed35d0027ec1c6e4a52df60f77ed", "f1a8a6bfc3f3cfa5db76188549ec5f351eb70e0a" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Sep 09 10:56:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 10:56:44 2024 +0000" }, "message": "Merge \"Drop dead code\" into main am: 3dcd8762b9 am: f1a8a6bfc3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3256659\n\nChange-Id: I60d2a78a04431400bd88c0066548b0c636405772\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f1a8a6bfc3f3cfa5db76188549ec5f351eb70e0a", "tree": "73a47f458333d7dcc197c86d7acf3d9c468d4b99", "parents": [ "2eec845af541c2a5f36a240ae20720dc351ce05a", "3dcd8762b9dbacf9831148c0d17428999bf1c4bc" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Sep 09 10:47:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 10:47:00 2024 +0000" }, "message": "Merge \"Drop dead code\" into main am: 3dcd8762b9\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3256659\n\nChange-Id: I7f711e018db22420438e2cb17817d94f71e700ca\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3dcd8762b9dbacf9831148c0d17428999bf1c4bc", "tree": "73a47f458333d7dcc197c86d7acf3d9c468d4b99", "parents": [ "67017df0bd0140fb473144a705bcb8ba397f3bee", "d078a9b61ceb10cb14043acf27a7c3db58e38fbf" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Sep 09 10:37:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 09 10:37:31 2024 +0000" }, "message": "Merge \"Drop dead code\" into main" }, { "commit": "2846f3288897ed35d0027ec1c6e4a52df60f77ed", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "27011ca847976683505ba1bf35cbe2ef96554f0f", "2eec845af541c2a5f36a240ae20720dc351ce05a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:40:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:40:54 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: 67017df0bd -s ours am: 2eec845af5 -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 4b4016caac is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3258515\n\nChange-Id: Ib931e0e624b43626461c8aa904d44e8740a0c546\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "27011ca847976683505ba1bf35cbe2ef96554f0f", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "137add6cb62d34811dd6133d79c06ba792ecb6cc", "d87a8fa16c613f65093b9d24d8759e789e3f7337" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:40:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:40:51 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: f1af3a7819 -s ours am: d87a8fa16c -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 4b4016caac is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3258515\n\nChange-Id: I0067287e3e3fb2cbcf8fb7b1847922dede8e850c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2eec845af541c2a5f36a240ae20720dc351ce05a", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "d87a8fa16c613f65093b9d24d8759e789e3f7337", "67017df0bd0140fb473144a705bcb8ba397f3bee" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:12:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:12:50 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: 67017df0bd -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 4b4016caac is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3258515\n\nChange-Id: Ia3f4d65c446e6099056dd9f45b36862f035b2f5a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d87a8fa16c613f65093b9d24d8759e789e3f7337", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "d7143469062856f7477eb4d825469e880e8a3a5d", "f1af3a7819df5ccd820c3597150712d942b370c8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:12:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:12:46 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: f1af3a7819 -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 4b4016caac is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3258515\n\nChange-Id: I8c3d6f8f3af6655a9c5678df8beca54bd1a772f9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "67017df0bd0140fb473144a705bcb8ba397f3bee", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "9eacb9bd9c974f6abe5964e0a6c753ecb73b491e", "f1af3a7819df5ccd820c3597150712d942b370c8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:14:23 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Sep 07 01:14:23 2024 +0000" }, "message": "Merge \"Merge 24Q3 to AOSP main\" into main" }, { "commit": "137add6cb62d34811dd6133d79c06ba792ecb6cc", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "cebcccf12bdaad4d61c0eeb7bf9897a1a761fb8d", "d7143469062856f7477eb4d825469e880e8a3a5d" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Fri Sep 06 06:27:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 06:27:26 2024 +0000" }, "message": "Update code for Rust 1.81.0 am: 9eacb9bd9c am: d714346906\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3257652\n\nChange-Id: I8c56c05b686beb43ff3b23584192dcd117a4dad0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d078a9b61ceb10cb14043acf27a7c3db58e38fbf", "tree": "0f50ba297272f756742316707eab5d2a3dcec1ea", "parents": [ "9eacb9bd9c974f6abe5964e0a6c753ecb73b491e" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Sep 06 07:19:28 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Sep 06 07:22:21 2024 +0100" }, "message": "Drop dead code\n\nRemnant of old test code.\n\nTest: TreeHugger\nChange-Id: I64f888d3e9af03306c69b3e4efbe35dab9c1c7c3\n" }, { "commit": "d7143469062856f7477eb4d825469e880e8a3a5d", "tree": "6568aa3ddf572700cacbf62264bd1d876bb19361", "parents": [ "a0bf5bd3ca8d055ca2c42f00ca4391390ea9481a", "9eacb9bd9c974f6abe5964e0a6c753ecb73b491e" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Fri Sep 06 06:16:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 06:16:29 2024 +0000" }, "message": "Update code for Rust 1.81.0 am: 9eacb9bd9c\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3257652\n\nChange-Id: Iff657871bcb96ddbf61cade1dcf4a7bcd0fe5799\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f1af3a7819df5ccd820c3597150712d942b370c8", "tree": "37a9403a90ce970b92ffcee40af65ab176aa61cd", "parents": [ "732e4753f39aa2f45a28f8e792013181ce6a3434", "a0bf5bd3ca8d055ca2c42f00ca4391390ea9481a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:07 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:07 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I25a7bad23e74e566df9e6c09d4d01ab03f0437de\nChange-Id: I62f8728fc862e0dba956fdf590c3b4dd7cbf49cf\n" }, { "commit": "9eacb9bd9c974f6abe5964e0a6c753ecb73b491e", "tree": "f6ff0e3cbab4b112b44cf716d441cb05b4bedc8c", "parents": [ "732e4753f39aa2f45a28f8e792013181ce6a3434" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Wed Sep 04 13:29:39 2024 -0700" }, "committer": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Thu Sep 05 13:37:56 2024 -0700" }, "message": "Update code for Rust 1.81.0\n\nMark code as dead to silence a new warning.\n\nTest: m libkmr_common\nBug: 364333811\nChange-Id: I2618f118c37e8c1d1495731266516651647b534b\n" }, { "commit": "cebcccf12bdaad4d61c0eeb7bf9897a1a761fb8d", "tree": "37a9403a90ce970b92ffcee40af65ab176aa61cd", "parents": [ "8071d9d6134ec603d35226404ca466a7e6816d35", "a0bf5bd3ca8d055ca2c42f00ca4391390ea9481a" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Thu Aug 22 06:46:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 22 06:46:26 2024 +0000" }, "message": "Update source for Rust 1.80.1 am: 732e4753f3 am: a0bf5bd3ca\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3236679\n\nChange-Id: I863db08495d16414552ccb308f6fae2798a18ad2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a0bf5bd3ca8d055ca2c42f00ca4391390ea9481a", "tree": "37a9403a90ce970b92ffcee40af65ab176aa61cd", "parents": [ "f543629ef0ccc21409c50548237f81ca55de4198", "732e4753f39aa2f45a28f8e792013181ce6a3434" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Thu Aug 22 06:23:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 22 06:23:43 2024 +0000" }, "message": "Update source for Rust 1.80.1 am: 732e4753f3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3236679\n\nChange-Id: Ia63696acb9f6a02f999698ef65005ac4c1077602\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "732e4753f39aa2f45a28f8e792013181ce6a3434", "tree": "6454931233663acc44acd4262f2af5b94d883de4", "parents": [ "c7fc505c1efb8ca6018ca1bc0b60070585a91489" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Mon Aug 19 16:21:31 2024 -0700" }, "committer": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Wed Aug 21 12:24:38 2024 -0700" }, "message": "Update source for Rust 1.80.1\n\nFix some documentation indentation.\n\nTest: m rust\nBug: 361370910\nChange-Id: I13d28103776da6bd3954d529a8b9cecdb6bf4d40\n" }, { "commit": "8071d9d6134ec603d35226404ca466a7e6816d35", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "6bc262c918db9634f8c9bb80fbe3ce34d81548d4", "869a996f57741caaabdbd02dd2ebfde93e9d95dc" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Aug 19 12:20:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 19 12:20:23 2024 +0000" }, "message": "[automerger skipped] Update legacy provisioning msg list am: c5755257e5 am: c7084244dc am: 869a996f57 -s ours\n\nam skip reason: Merged-In I797438c18a9e0a9d8c26e3039805407b0c217893 with SHA-1 c5755257e5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/28483938\n\nChange-Id: I5272c41b31bf99519822293b59c524eb2468309c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "869a996f57741caaabdbd02dd2ebfde93e9d95dc", "tree": "e7f2bc801d2b78676d8120753c9d2b7608588781", "parents": [ "889099a3d640077f33d7e647ad6de38a3301af4e", "c7084244dc46c7c97f951a5d27285ce4e62709e8" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Aug 19 12:05:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 19 12:05:04 2024 +0000" }, "message": "Update legacy provisioning msg list am: c5755257e5 am: c7084244dc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/28483938\n\nChange-Id: I43f98c505612cfc56da10dc8acabdd8f6be4782e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6bc262c918db9634f8c9bb80fbe3ce34d81548d4", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "c46a42aa28c5dadc229e6929ac4d296585ff0dd8", "c6af236a5f07ff40fc49aab51b21f6613f1f209c" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Aug 19 12:04:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 19 12:04:53 2024 +0000" }, "message": "[automerger skipped] Update legacy provisioning msg list am: c5755257e5 am: c6af236a5f -s ours\n\nam skip reason: Merged-In I797438c18a9e0a9d8c26e3039805407b0c217893 with SHA-1 6b764647e7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/28483938\n\nChange-Id: I2e01b2997fb13d91d619e24e578da1890bfc1706\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c6af236a5f07ff40fc49aab51b21f6613f1f209c", "tree": "e7f2bc801d2b78676d8120753c9d2b7608588781", "parents": [ "b0960df89064e3058199539f664f647ec0c5cb16", "c5755257e556ef0a63bb0a2265e68aeca8af3494" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Aug 19 11:52:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 19 11:52:14 2024 +0000" }, "message": "Update legacy provisioning msg list am: c5755257e5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/28483938\n\nChange-Id: I27678b31093777351921be1b8d65295c2c4ff850\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c7084244dc46c7c97f951a5d27285ce4e62709e8", "tree": "e7f2bc801d2b78676d8120753c9d2b7608588781", "parents": [ "889099a3d640077f33d7e647ad6de38a3301af4e", "c5755257e556ef0a63bb0a2265e68aeca8af3494" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Aug 19 11:51:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 19 11:51:58 2024 +0000" }, "message": "Update legacy provisioning msg list am: c5755257e5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/28483938\n\nChange-Id: Id3086448e358b74b9b04284e025ddf8cb6bfd077\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c46a42aa28c5dadc229e6929ac4d296585ff0dd8", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "e2f6ae636693194f0b32cefded2bfcc353fca823", "f543629ef0ccc21409c50548237f81ca55de4198" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 29 15:32:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 29 15:32:56 2024 +0000" }, "message": "[automerger skipped] Merge \"Introduce Set/Clear UdsCertificate requests\" into main am: c7fc505c1e -s ours am: f543629ef0 -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 75756f576e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3061603\n\nChange-Id: Iea26eac7312c52b3557a0f74f848d8221bb3ab51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e2f6ae636693194f0b32cefded2bfcc353fca823", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "99c6a0e2e8c94f145d52e438124fb599796b2f6a", "68ce9a840eb1941d2dba493c4c7907ccfd687836" ], "author": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Mon Jul 29 15:32:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 29 15:32:53 2024 +0000" }, "message": "[automerger skipped] Introduce Set/Clear UdsCertificate requests am: 4b4016caac -s ours am: 68ce9a840e -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 75756f576e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3061603\n\nChange-Id: Ibeeb662dc5064857c19e5406ad5cde6344144f00\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f543629ef0ccc21409c50548237f81ca55de4198", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "68ce9a840eb1941d2dba493c4c7907ccfd687836", "c7fc505c1efb8ca6018ca1bc0b60070585a91489" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 29 15:16:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 29 15:16:59 2024 +0000" }, "message": "[automerger skipped] Merge \"Introduce Set/Clear UdsCertificate requests\" into main am: c7fc505c1e -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 75756f576e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3061603\n\nChange-Id: I048b604a5062b35779cde0118e55fd4280c71c52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "68ce9a840eb1941d2dba493c4c7907ccfd687836", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "75756f576e14542cb4d6719617f376bcbe0487fd", "4b4016caac516e5a56543fe88a0adcd4f776d83f" ], "author": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Mon Jul 29 15:16:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 29 15:16:55 2024 +0000" }, "message": "[automerger skipped] Introduce Set/Clear UdsCertificate requests am: 4b4016caac -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 75756f576e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3061603\n\nChange-Id: I99b7001270a602cd8febd3a1727a1f62584efe18\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c7fc505c1efb8ca6018ca1bc0b60070585a91489", "tree": "51e0a14246a93b9a65d1440f6e338e1cf53fe2d0", "parents": [ "208ecb4f77ff5a69b8633b47f871afc821461893", "4b4016caac516e5a56543fe88a0adcd4f776d83f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 29 14:59:20 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 29 14:59:20 2024 +0000" }, "message": "Merge \"Introduce Set/Clear UdsCertificate requests\" into main" }, { "commit": "99c6a0e2e8c94f145d52e438124fb599796b2f6a", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "8f21ec5d11347913b5cceff878cbfa0f8e4a619b", "75756f576e14542cb4d6719617f376bcbe0487fd" ], "author": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Fri Jul 26 14:09:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 26 14:09:19 2024 +0000" }, "message": "[automerger skipped] Introduce Set/Clear UdsCertificate requests am: 75756f576e -s ours\n\nam skip reason: Merged-In I25a7bad23e74e566df9e6c09d4d01ab03f0437de with SHA-1 a1325f484b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/28487016\n\nChange-Id: I41ab89ae18c070d36236ab76ffef32b1f0458239\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75756f576e14542cb4d6719617f376bcbe0487fd", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "298542f012b9bab39fb66ba1469d00246fc16142" ], "author": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Fri Apr 26 00:33:20 2024 +0000" }, "committer": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Fri Jul 26 20:00:40 2024 +0800" }, "message": "Introduce Set/Clear UdsCertificate requests\n\nBug: 330791928\nTest: Build pass\nChange-Id: I25a7bad23e74e566df9e6c09d4d01ab03f0437de\nMerged-In: I25a7bad23e74e566df9e6c09d4d01ab03f0437de\n" }, { "commit": "8f21ec5d11347913b5cceff878cbfa0f8e4a619b", "tree": "0057ecf94d9adf3442097d38884c5777d6aab344", "parents": [ "03f8e27e78d4d63952bb6b23956b976b82df9825", "a1325f484bbf2892b622884d8bc1d5a2b29c46d7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jul 25 11:10:11 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 25 11:10:11 2024 +0000" }, "message": "Merge \"Introduce Set/Clear UdsCertificate requests\" into main" }, { "commit": "c5755257e556ef0a63bb0a2265e68aeca8af3494", "tree": "e7f2bc801d2b78676d8120753c9d2b7608588781", "parents": [ "d5b91adcb70c18b9f1005c186b56f81d7e04727f" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Wed Mar 27 11:46:55 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Jul 25 10:07:13 2024 +0000" }, "message": "Update legacy provisioning msg list\n\nBug: 329701910\nTest: trusty_keymaster_set_attestation_ids\nIgnore-AOSP-First: security impact\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6b764647e769c8b1bf3bb131ecc6724f4fee7a82)\nMerged-In: I797438c18a9e0a9d8c26e3039805407b0c217893\nChange-Id: I797438c18a9e0a9d8c26e3039805407b0c217893\n" }, { "commit": "03f8e27e78d4d63952bb6b23956b976b82df9825", "tree": "2a4352d106926cf9a3a8b816e5362a63a1d5f9ea", "parents": [ "ce9473518056f82e26c63f873f4b404879dfcf48", "298542f012b9bab39fb66ba1469d00246fc16142" ], "author": { "name": "Steven Tsai", "email": "steventsai@google.com", "time": "Wed Jul 24 14:22:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 24 14:22:27 2024 +0000" }, "message": "Change the order of SetAttestationIdsRequest\u0027s fields in Rust am: 208ecb4f77 am: 298542f012\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3192730\n\nChange-Id: Ie3b341d8ccf0333be2b532974180476e4217af97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "298542f012b9bab39fb66ba1469d00246fc16142", "tree": "2a4352d106926cf9a3a8b816e5362a63a1d5f9ea", "parents": [ "32e0f84d561de4cc1e485cf49a1451d31ec12081", "208ecb4f77ff5a69b8633b47f871afc821461893" ], "author": { "name": "Steven Tsai", "email": "steventsai@google.com", "time": "Wed Jul 24 14:03:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 24 14:03:45 2024 +0000" }, "message": "Change the order of SetAttestationIdsRequest\u0027s fields in Rust am: 208ecb4f77\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3192730\n\nChange-Id: I1c9f980d95c9a049a703151172fccbabec7ed1f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "208ecb4f77ff5a69b8633b47f871afc821461893", "tree": "e8d88502d75e3437e07a6d764dcec8bfb2b23721", "parents": [ "569f8dd6d0a3427870b0808ed28f66527656c718" ], "author": { "name": "Steven Tsai", "email": "steventsai@google.com", "time": "Wed Jul 24 18:49:52 2024 +0800" }, "committer": { "name": "Steven Tsai", "email": "steventsai@google.com", "time": "Wed Jul 24 19:51:47 2024 +0800" }, "message": "Change the order of SetAttestationIdsRequest\u0027s fields in Rust\n\nCurrently, the order of members differs between:\n * system/keymint/wire/src/legacy.rs\n * system/keymaster/include/keymaster/android_keymaster_messages.h\n\nThe mismatch caused Trusty Keymaster requests to be misinterpreted by Rust KeyMint,\nleading to failed ID attestations if `device` is different from `product`.\n\nBug: 355168378\nChange-Id: I3728f43b59e9a9514ffac17633a1f4857adf1e2e\nSigned-off-by: Steven Tsai \u003csteventsai@google.com\u003e\n" }, { "commit": "4b4016caac516e5a56543fe88a0adcd4f776d83f", "tree": "d33d1d32b2ccedecf8df5f4d6e5cb05389c932e2", "parents": [ "a926597aad85bbd198d0916bc52a0173688640a3" ], "author": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Fri Apr 26 00:33:20 2024 +0000" }, "committer": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Wed Jul 24 10:36:58 2024 +0000" }, "message": "Introduce Set/Clear UdsCertificate requests\n\nBug: 330791928\nTest: Build pass\nChange-Id: I25a7bad23e74e566df9e6c09d4d01ab03f0437de\nMerged-In: I25a7bad23e74e566df9e6c09d4d01ab03f0437de\n" }, { "commit": "a1325f484bbf2892b622884d8bc1d5a2b29c46d7", "tree": "89928490f52020e7259ca40651b558c2c0c394f3", "parents": [ "9c1dc93b748314ca37f94786fc144318388baa25" ], "author": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Fri Apr 26 00:33:20 2024 +0000" }, "committer": { "name": "Tommy Chiu", "email": "tommychiu@google.com", "time": "Mon Jul 22 15:48:13 2024 +0000" }, "message": "Introduce Set/Clear UdsCertificate requests\n\nBug: 330791928\nTest: Build pass\nChange-Id: I25a7bad23e74e566df9e6c09d4d01ab03f0437de\n" }, { "commit": "ce9473518056f82e26c63f873f4b404879dfcf48", "tree": "e6ffb7b2e1f5f87c614fd60c3e6242a6aa5cf588", "parents": [ "ff5f27216f3309f6b739a3b4460084ee12e342df", "32e0f84d561de4cc1e485cf49a1451d31ec12081" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Jul 19 08:54:49 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 19 08:54:49 2024 +0000" }, "message": "Merge \"README: fix typo, clarify\" into main am: 569f8dd6d0 am: 32e0f84d56\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3182999\n\nChange-Id: I8fa1aac957d961ec20ecae624f6106783eec7b6e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "32e0f84d561de4cc1e485cf49a1451d31ec12081", "tree": "e6ffb7b2e1f5f87c614fd60c3e6242a6aa5cf588", "parents": [ "fec5478e9b1e0ff6b3359746b27131c6747bb6bf", "569f8dd6d0a3427870b0808ed28f66527656c718" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Jul 19 08:40:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 19 08:40:16 2024 +0000" }, "message": "Merge \"README: fix typo, clarify\" into main am: 569f8dd6d0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3182999\n\nChange-Id: I0c953e84c2fc27a7529d3f031b46c55826c1bf9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "569f8dd6d0a3427870b0808ed28f66527656c718", "tree": "012df9afc719c48599475d973e6280bca1669d9c", "parents": [ "ab43dfd2a3c6580a7c6047f7cae600d1510981de", "d842ae65b1bd4f1aef6e7485014985f5fd8f4dd9" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Jul 19 08:21:33 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 19 08:21:33 2024 +0000" }, "message": "Merge \"README: fix typo, clarify\" into main" }, { "commit": "d842ae65b1bd4f1aef6e7485014985f5fd8f4dd9", "tree": "ea2e2f4dff67d99063f427ccf56a6615e01168cf", "parents": [ "d1d6e78af1dfed426bb74fe1d9f4b47cddea8d78" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jul 18 16:42:52 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jul 18 16:42:52 2024 +0100" }, "message": "README: fix typo, clarify\n\nTest: None\nChange-Id: Ie7882099715728e266aea82558a5ce02b0034efd\n" }, { "commit": "ff5f27216f3309f6b739a3b4460084ee12e342df", "tree": "886a3d57c9eb566fb11fa5b2d1c0b94e0e69495e", "parents": [ "97332aebfb5dd9461e2c9125f09c2631eff33896", "fec5478e9b1e0ff6b3359746b27131c6747bb6bf" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jul 18 13:13:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 18 13:13:54 2024 +0000" }, "message": "Merge \"README: describe authenticator requirements\" into main am: ab43dfd2a3 am: fec5478e9b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3145118\n\nChange-Id: I85f054456205bc88235b8692df616b40faacf39e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fec5478e9b1e0ff6b3359746b27131c6747bb6bf", "tree": "886a3d57c9eb566fb11fa5b2d1c0b94e0e69495e", "parents": [ "8d98f45eb882fce90a02e7279d227feb398c33e6", "ab43dfd2a3c6580a7c6047f7cae600d1510981de" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jul 18 12:58:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 18 12:58:44 2024 +0000" }, "message": "Merge \"README: describe authenticator requirements\" into main am: ab43dfd2a3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3145118\n\nChange-Id: I30f2ed91ee8140f41973389455a4810170af2c46\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ab43dfd2a3c6580a7c6047f7cae600d1510981de", "tree": "8ad583f38d74754c6d2ae443646851b42bb11a88", "parents": [ "d1d6e78af1dfed426bb74fe1d9f4b47cddea8d78", "3e5186d3f545300c91637675b38f9306f431272b" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jul 18 12:36:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 18 12:36:31 2024 +0000" }, "message": "Merge \"README: describe authenticator requirements\" into main" }, { "commit": "97332aebfb5dd9461e2c9125f09c2631eff33896", "tree": "187098097eced85f4065697be692a42b5c67f070", "parents": [ "d83183b45aaf894ecfe6a3c6b760c716310eecf1", "8d98f45eb882fce90a02e7279d227feb398c33e6" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Jul 16 11:10:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 16 11:10:23 2024 +0000" }, "message": "Merge \"Fix doc comment links\" into main am: d1d6e78af1 am: 8d98f45eb8\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3172481\n\nChange-Id: Ib899bb9565d5d3d78ee8f2400fc912cd88aa6019\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8d98f45eb882fce90a02e7279d227feb398c33e6", "tree": "187098097eced85f4065697be692a42b5c67f070", "parents": [ "60e0a988d8394e55a2eacb82f0593199a6ffa25c", "d1d6e78af1dfed426bb74fe1d9f4b47cddea8d78" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Jul 16 10:48:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 16 10:48:02 2024 +0000" }, "message": "Merge \"Fix doc comment links\" into main am: d1d6e78af1\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3172481\n\nChange-Id: I32393add26b6900bb14cc896c12b6649dcdb9f2a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1d6e78af1dfed426bb74fe1d9f4b47cddea8d78", "tree": "252cd163c81680fbca213affac43a246fc6fdd5e", "parents": [ "9f75421f19d629d93daf540c950ed0fe2af11a77", "244b38478a7884400f01d101abe48c80d47bb7e5" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Jul 16 10:31:48 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 16 10:31:48 2024 +0000" }, "message": "Merge \"Fix doc comment links\" into main" }, { "commit": "244b38478a7884400f01d101abe48c80d47bb7e5", "tree": "a28c8a4b6a3acba3784d5081e542f4ac2d8ae3e5", "parents": [ "6acb6420a5d76a2b8d373beed22c427cfdc1fc69" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 12:34:20 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 12:57:49 2024 +0100" }, "message": "Fix doc comment links\n\nTest: build\nChange-Id: I88b63334f0a7bb7e8bbe36dc4091d622e3ef0e29\n" }, { "commit": "d83183b45aaf894ecfe6a3c6b760c716310eecf1", "tree": "665f85744318fd8d2ca8f31b79c8249edde43c77", "parents": [ "17b1b12f72883ea5fb803ea9760dccc2abbd3519", "60e0a988d8394e55a2eacb82f0593199a6ffa25c" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 11:14:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 15 11:14:48 2024 +0000" }, "message": "Merge \"Remove doc comment linkage for CDDL types\" into main am: 9f75421f19 am: 60e0a988d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3172479\n\nChange-Id: I0e226add568e3dad0fc504fedd066580acf7d522\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "17b1b12f72883ea5fb803ea9760dccc2abbd3519", "tree": "d9966d12d7cbaab324d540d00e0b2e2a52af71fa", "parents": [ "46d6ef5b64bf4854028d361bfbad23aedfd80da1", "6bb37f779c6ff1c12530a76f23e67a6e583643c6" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 11:14:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 15 11:14:20 2024 +0000" }, "message": "Merge \"Tweaks for unwrap() safety\" into main am: 77e51207b3 am: 6bb37f779c\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3133799\n\nChange-Id: I035ef9e3e1ca4e0ad8100e511147803b8af68b8b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "60e0a988d8394e55a2eacb82f0593199a6ffa25c", "tree": "665f85744318fd8d2ca8f31b79c8249edde43c77", "parents": [ "6bb37f779c6ff1c12530a76f23e67a6e583643c6", "9f75421f19d629d93daf540c950ed0fe2af11a77" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 10:52:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 15 10:52:35 2024 +0000" }, "message": "Merge \"Remove doc comment linkage for CDDL types\" into main am: 9f75421f19\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3172479\n\nChange-Id: I76a7b610ccc0c8fd6a0f833c87b1fd575b46b24f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6bb37f779c6ff1c12530a76f23e67a6e583643c6", "tree": "d9966d12d7cbaab324d540d00e0b2e2a52af71fa", "parents": [ "126c927f0ac90bdf8d748cb14eb3e0a9fe72f0c8", "77e51207b36c4fcb1d772fa920239c5eaa5e8e17" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 10:52:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 15 10:52:24 2024 +0000" }, "message": "Merge \"Tweaks for unwrap() safety\" into main am: 77e51207b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3133799\n\nChange-Id: I7c213ceff5e2eef8c9519f7d1e1f158ecd49886c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9f75421f19d629d93daf540c950ed0fe2af11a77", "tree": "202996c036ef4135ad90179a74fd3eabd7de4509", "parents": [ "77e51207b36c4fcb1d772fa920239c5eaa5e8e17", "6acb6420a5d76a2b8d373beed22c427cfdc1fc69" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 10:47:13 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 15 10:47:13 2024 +0000" }, "message": "Merge \"Remove doc comment linkage for CDDL types\" into main" }, { "commit": "77e51207b36c4fcb1d772fa920239c5eaa5e8e17", "tree": "b92953e3521d9a3df7cd468d542308e50ca86f5f", "parents": [ "220fae70bb40bffe5ba33ac7326a032d83ef70b9", "ebc8afa57fb4fb3a77d709e77f3e18222404af89" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 10:31:39 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 15 10:31:39 2024 +0000" }, "message": "Merge \"Tweaks for unwrap() safety\" into main" }, { "commit": "ebc8afa57fb4fb3a77d709e77f3e18222404af89", "tree": "ea7a0d10cf65f44fd3023e342592ba59688eaf87", "parents": [ "df474a65a91f4e8093fe00454784b10b491de20c" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Jun 18 09:47:59 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 09:55:34 2024 +0000" }, "message": "Tweaks for unwrap() safety\n\n- Add a comment noting an internal invariant.\n- Add an error return for a failure to build a BitStringRef.\n\nTest: VtsAidlKeyMintTargetTest\nChange-Id: I468a527c181cdaf5a6f0cf7b29e6ba76e953d05c\n" }, { "commit": "6acb6420a5d76a2b8d373beed22c427cfdc1fc69", "tree": "c17d89f59d068c3a9be303ec93df5905171f1a92", "parents": [ "220fae70bb40bffe5ba33ac7326a032d83ef70b9" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 10:08:29 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 15 10:11:04 2024 +0100" }, "message": "Remove doc comment linkage for CDDL types\n\nTypes from CDDL should be in `code font`, but are not Rust\nidentifiers so should not have [`Markdown links`].\n\nTest: build\nChange-Id: I963787826841a213b210741e6216196197d2f141\n" }, { "commit": "46d6ef5b64bf4854028d361bfbad23aedfd80da1", "tree": "836a1f09ec2a624fc9080ad336adb8479051fcd5", "parents": [ "9c1dc93b748314ca37f94786fc144318388baa25", "126c927f0ac90bdf8d748cb14eb3e0a9fe72f0c8" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 08 10:36:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 08 10:36:34 2024 +0000" }, "message": "Tune errors for failure to set RoT am: 220fae70bb am: 126c927f0a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3150118\n\nChange-Id: I0e9f118523daaa0ff610e88d323eef41456ed6bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "126c927f0ac90bdf8d748cb14eb3e0a9fe72f0c8", "tree": "836a1f09ec2a624fc9080ad336adb8479051fcd5", "parents": [ "3ea92c0115b0ec1e2a4e6f599dca023059866b29", "220fae70bb40bffe5ba33ac7326a032d83ef70b9" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Mon Jul 08 10:24:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 08 10:24:52 2024 +0000" }, "message": "Tune errors for failure to set RoT am: 220fae70bb\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3150118\n\nChange-Id: I03498d463370990347ee75fcb006bcb7c19031ef\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "220fae70bb40bffe5ba33ac7326a032d83ef70b9", "tree": "1ad4d1b393a95b4cb56380410e7d1514ec2a2935", "parents": [ "a926597aad85bbd198d0916bc52a0173688640a3" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jun 27 06:58:31 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Thu Jun 27 11:37:08 2024 +0100" }, "message": "Tune errors for failure to set RoT\n\nTest: printf debugging with hacked HAL service\nChange-Id: Ice6fc834752833427dda537dee54b082d8d5e45d\n" }, { "commit": "3e5186d3f545300c91637675b38f9306f431272b", "tree": "b1d4910515556e40dbdbe5d9ca02d5ed5e48405f", "parents": [ "a926597aad85bbd198d0916bc52a0173688640a3" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Jun 25 11:04:55 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Tue Jun 25 11:04:55 2024 +0100" }, "message": "README: describe authenticator requirements\n\nTest: None\nChange-Id: If53fb97a32d810fb817fce3e5b78f875e702e7ff\n" }, { "commit": "9c1dc93b748314ca37f94786fc144318388baa25", "tree": "641437b6f0df7894c07f30260e542ea374ec6fe5", "parents": [ "003daeec9e62ef349d41b927bcaa9f341ab29159", "3ea92c0115b0ec1e2a4e6f599dca023059866b29" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 19:56:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 19:56:48 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 3ea92c0115 -s ours\n\nam skip reason: Merged-In I797438c18a9e0a9d8c26e3039805407b0c217893 with SHA-1 6b764647e7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/27909516\n\nChange-Id: Id2e649a04e92731edc598d4033773c441da37553\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3ea92c0115b0ec1e2a4e6f599dca023059866b29", "tree": "641437b6f0df7894c07f30260e542ea374ec6fe5", "parents": [ "a926597aad85bbd198d0916bc52a0173688640a3", "003daeec9e62ef349d41b927bcaa9f341ab29159" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:52 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:52 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I797438c18a9e0a9d8c26e3039805407b0c217893\nChange-Id: I799f876d967a585e01add79ae5c5b99ec6639d89\n" }, { "commit": "003daeec9e62ef349d41b927bcaa9f341ab29159", "tree": "641437b6f0df7894c07f30260e542ea374ec6fe5", "parents": [ "388272485a91685be4cd467fbe623f0f189c346c", "a926597aad85bbd198d0916bc52a0173688640a3" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri May 31 17:38:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 31 17:38:15 2024 +0000" }, "message": "Fuzz parsing of KeyDescription for wrapped keys am: df474a65a9 am: a926597aad\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3110139\n\nChange-Id: I7c2a348d649d8ea8d02895d65c7ffbeab73d16b1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a926597aad85bbd198d0916bc52a0173688640a3", "tree": "c31f68ea70f90917f404df9e3099e959c1b17aa2", "parents": [ "2048a35a47db0a3ddc02ad784b23247d7c027439", "df474a65a91f4e8093fe00454784b10b491de20c" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri May 31 17:22:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 31 17:22:31 2024 +0000" }, "message": "Fuzz parsing of KeyDescription for wrapped keys am: df474a65a9\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3110139\n\nChange-Id: Ib96e6a9c92df6ee5901d582f0a6edc1943ebdb83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "df474a65a91f4e8093fe00454784b10b491de20c", "tree": "c31f68ea70f90917f404df9e3099e959c1b17aa2", "parents": [ "eae66423133c605c23c1cbcf0cde129949e7b2d1" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri May 31 15:00:28 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri May 31 15:35:01 2024 +0100" }, "message": "Fuzz parsing of KeyDescription for wrapped keys\n\nThe `IKeyMintDevice::importWrappedKey` entrypoint involves parsing an\nASN.1 structure to determine the parameters for the imported key.\nAdd a fuzzer for this parsing.\n\nAlso remove host-only restriction for libkmr_common_fuzz_keyblob, as\nthis has been removed.\n\nBug: 308771798\nTest: libkmr_common_fuzz_keyblob\nTest: libkmr_ta_fuzz_keydescription\nChange-Id: I792d6c3b80e9e11b507a5a1eaf3579844e96c267\n" }, { "commit": "388272485a91685be4cd467fbe623f0f189c346c", "tree": "ff152cc2e6d263f0be80219a75dcd1ac772e97a9", "parents": [ "9615f573c9dfbe03ed11440bda7498a5f1946f45", "2048a35a47db0a3ddc02ad784b23247d7c027439" ], "author": { "name": "Ellen Arteca", "email": "emarteca@google.com", "time": "Wed May 15 03:12:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 15 03:12:28 2024 +0000" }, "message": "Merge \"Wraps call to boringssl unsafe exports in `unsafe`\" into main am: eae6642313 am: 2048a35a47\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3081806\n\nChange-Id: I196ac99d54bec16ffe9634fc2006303f3087d662\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2048a35a47db0a3ddc02ad784b23247d7c027439", "tree": "c8bf70f5e97b2194016a52a7270c7c921e1e12ea", "parents": [ "8bbe8f09c485f0b4f944a1a4d82e054a9c7558eb", "eae66423133c605c23c1cbcf0cde129949e7b2d1" ], "author": { "name": "Ellen Arteca", "email": "emarteca@google.com", "time": "Wed May 15 03:08:22 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 15 03:08:22 2024 +0000" }, "message": "Merge \"Wraps call to boringssl unsafe exports in `unsafe`\" into main am: eae6642313\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3081806\n\nChange-Id: I462e90781e5b8670b9a5a9aa1a8954f870130d97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eae66423133c605c23c1cbcf0cde129949e7b2d1", "tree": "c8bf70f5e97b2194016a52a7270c7c921e1e12ea", "parents": [ "a34550995ba61137345f586dec72564cbba8b0ed", "ed8c1d13a7fb25c1352191da56dad8fba313005f" ], "author": { "name": "Ellen Arteca", "email": "emarteca@google.com", "time": "Wed May 15 02:50:56 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed May 15 02:50:56 2024 +0000" }, "message": "Merge \"Wraps call to boringssl unsafe exports in `unsafe`\" into main" }, { "commit": "ed8c1d13a7fb25c1352191da56dad8fba313005f", "tree": "6af6900d13c4f1f6f735d2e8dfc0f78556575a10", "parents": [ "eaf90c98e641d8f2e7d0d3d19c5a41aba1e3db54" ], "author": { "name": "Ellen Arteca", "email": "emarteca@google.com", "time": "Thu May 09 20:52:43 2024 +0000" }, "committer": { "name": "Ellen Arteca", "email": "emarteca@google.com", "time": "Tue May 14 00:28:59 2024 +0000" }, "message": "Wraps call to boringssl unsafe exports in `unsafe`\n\nWrappers to C inline functions in boringssl are now being re-exported, and\nso calls to these functions in Rust need to be wrapped with `unsafe`.\n\nTest: m checkbuild\nChange-Id: I1eb555638edb1c24ed82d51b9005c3f183264f93\n" }, { "commit": "9615f573c9dfbe03ed11440bda7498a5f1946f45", "tree": "e0a0a1216c1e34a87e9d726c595bf7efb47fe4ed", "parents": [ "8536d96ce4ac48587cb13f7c2e1d1fdfe437683f", "8bbe8f09c485f0b4f944a1a4d82e054a9c7558eb" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Fri May 10 21:09:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 10 21:09:59 2024 +0000" }, "message": "Update source for Rust 1.78.0 am: a34550995b am: 8bbe8f09c4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3080352\n\nChange-Id: I2ccbcaf1b529fe4f047f8a5cd1f57d23db48c1a3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8bbe8f09c485f0b4f944a1a4d82e054a9c7558eb", "tree": "ee5e41685d5b1c6612ebf5a61ff196b305777bd2", "parents": [ "a0218ad3473c88a2dad4f65274a020b25012b94d", "a34550995ba61137345f586dec72564cbba8b0ed" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Fri May 10 20:47:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 10 20:47:50 2024 +0000" }, "message": "Update source for Rust 1.78.0 am: a34550995b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3080352\n\nChange-Id: I0636f0d484f94dbfd211105d512c7797480d812e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a34550995ba61137345f586dec72564cbba8b0ed", "tree": "ee5e41685d5b1c6612ebf5a61ff196b305777bd2", "parents": [ "eaf90c98e641d8f2e7d0d3d19c5a41aba1e3db54" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Thu May 09 17:02:44 2024 -0700" }, "committer": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Fri May 10 11:39:51 2024 -0700" }, "message": "Update source for Rust 1.78.0\n\nTest: m rust\nBug: 333887339\nChange-Id: I40120081cee9334d457b066c9627275668952646\n" }, { "commit": "8536d96ce4ac48587cb13f7c2e1d1fdfe437683f", "tree": "d8eabf7aaba36093fcb24484a7ec942c18a63559", "parents": [ "12dbc7dd43acc0eebf6a486acf885795c088dc01", "a0218ad3473c88a2dad4f65274a020b25012b94d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 21:50:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 21:50:05 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: a0218ad347 -s ours\n\nam skip reason: Merged-In I1dc974b11a6f92b87ee4acbec1643a3b8228bf0c with SHA-1 96309a6b85 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/27145244\n\nChange-Id: Ib4385a78cd549cb854c366af093c5b3258f13322\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a0218ad3473c88a2dad4f65274a020b25012b94d", "tree": "db544b6a38a3f34550e50c713f8bf17ac1427926", "parents": [ "96309a6b85f82b6babb7bce93afa576c9cc1e551", "eeb692d87980abd8595ea19b3d7fb49e99f335ce" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:53:33 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:53:33 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I1dc974b11a6f92b87ee4acbec1643a3b8228bf0c\nChange-Id: I73ebaaddc1ee195269499533a5a719f13cd98b33\n" }, { "commit": "12dbc7dd43acc0eebf6a486acf885795c088dc01", "tree": "d8eabf7aaba36093fcb24484a7ec942c18a63559", "parents": [ "2d7ffbee3c800ad17644e8d67af4d3097580f569", "96309a6b85f82b6babb7bce93afa576c9cc1e551" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Apr 26 13:17:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 26 13:17:10 2024 +0000" }, "message": "Upgrade to syn2 dep am: eaf90c98e6 am: 96309a6b85\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3064163\n\nChange-Id: Ia930185668173384f5c47acd092d7b57f9ee9d71\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "96309a6b85f82b6babb7bce93afa576c9cc1e551", "tree": "db544b6a38a3f34550e50c713f8bf17ac1427926", "parents": [ "e1c67187c823e30251cd415f39f3d26bc90b3108", "eaf90c98e641d8f2e7d0d3d19c5a41aba1e3db54" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Apr 26 13:02:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 26 13:02:41 2024 +0000" }, "message": "Upgrade to syn2 dep am: eaf90c98e6\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/keymint/+/3064163\n\nChange-Id: I1dc974b11a6f92b87ee4acbec1643a3b8228bf0c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eaf90c98e641d8f2e7d0d3d19c5a41aba1e3db54", "tree": "db544b6a38a3f34550e50c713f8bf17ac1427926", "parents": [ "3793dea287efd399654aea3a4d6fe066842a884f" ], "author": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Apr 26 11:53:59 2024 +0100" }, "committer": { "name": "David Drysdale", "email": "drysdale@google.com", "time": "Fri Apr 26 11:54:07 2024 +0100" }, "message": "Upgrade to syn2 dep\n\nBug: 337204313\nTest: VtsAidlKeyMintTargetTest\nChange-Id: I48752bbcd46b7ff03c844039a2759c6dae18d0f6\n" } ], "next": "2d7ffbee3c800ad17644e8d67af4d3097580f569" }