summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-08Snap for 11192287 from b99423a0f5d941b920f3bda39caefde916b26834 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I1f543406ac7e4ec623bf61f4d720f64f4ba92d9b
2023-12-07Revert "Keymint 3.0 & IAR Support added" am: acfffa4a88 am: f79b65d422 am: ↵Bob Yang
ab41867e90 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2864405 Change-Id: I16b77328f4480835fcbf2e703d8db82dd203f109 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Revert "Keymint 3.0 & IAR Support added" am: acfffa4a88 am: f79b65d422Bob Yang
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2864405 Change-Id: Icf6796e440db7c3addce18b8419a44110c314172 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Revert "Keymint 3.0 & IAR Support added" am: acfffa4a88 am: d2aacb7651 am: ↵Bob Yang
7d46da89c9 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2864405 Change-Id: Ib26d421296f26fe1bc2896855a2fcba0d3b9d64d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Revert "Keymint 3.0 & IAR Support added" am: acfffa4a88Bob Yang
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2864405 Change-Id: Ia6c95bb50233ebd67263f813ef85ad3f09e42034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Revert "Keymint 3.0 & IAR Support added" am: acfffa4a88 am: d2aacb7651Bob Yang
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2864405 Change-Id: I457b7782dabe7c072912debf3d279662d19f5434 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Revert "Keymint 3.0 & IAR Support added" am: acfffa4a88Bob Yang
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2864405 Change-Id: I89871a0078f063f52398b4829f5c2ad24277d1d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Revert "Keymint 3.0 & IAR Support added"Bob Yang
This reverts commit 05f7124f9fb5955357727344a6cba1312b7082e3. Reason for revert: DroidMonitor: Potential culprit for Bug 315231416 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. BUG: 315231416 Change-Id: Ida7e2b8715510770a77d8c0e60fce241b01ee3a1
2023-12-06Keymint 3.0 & IAR Support added am: 05f7124f9f am: 2104755b65 am: f1b71dcb65suryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787541 Change-Id: I86382a780b39e0ecbc7c5c47ad5fe4195e12985b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Keymint 3.0 & IAR Support added am: 05f7124f9f am: 428ebad048 am: 932c1cd5ccsuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787541 Change-Id: I9400d88b4140ce3ceb8b0803c72126f7b87336d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Keymint 3.0 & IAR Support added am: 05f7124f9f am: 2104755b65suryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787541 Change-Id: I1e6557fea4773854a202ec234ed9544f68345db2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Keymint 3.0 & IAR Support added am: 05f7124f9f am: 428ebad048suryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787541 Change-Id: I307d346234a8176da8132d9b9949f186deee8685 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Keymint 3.0 & IAR Support added am: 05f7124f9fsuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787541 Change-Id: I96898fc18ced8624873ffb01f564e6cd50183c30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Keymint 3.0 & IAR Support added am: 05f7124f9fsuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787541 Change-Id: Ib45dd349a370acd71f466ce23a7df20d872b11d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Keymint 3.0 & IAR Support addedsuryaprakash.konduru
Bug: 303346066 Test: VtsAidlKeyMintTargetTest Change-Id: Icbbdc9763f6c0dbaee0dc2d66b1bb720af7f81af
2023-10-21Snap for 10985023 from 94cf5101c95148ed84c0a78f44b09d6a36c078ac to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Icfd43c435123d8c96282587b66977b3a84a12f87
2023-10-20Transport updated to support latest KM300, Weaver and IAR am: 88d813888f am: ↵suryaprakash.konduru
84945d38e2 am: ec5039c979 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2788993 Change-Id: I28805cb153a585abf8267a739866b9104dcc281d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Update in folder structure for keymint am: 4b044ced8a am: f2fcb44136 am: ↵suryaprakash.konduru
eedaedd40e Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787540 Change-Id: Ic5b9a6cb2d594a6f863fdb8272dac1ab37ede96e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Transport updated to support latest KM300, Weaver and IAR am: 88d813888f am: ↵suryaprakash.konduru
4413446040 am: 08fe69250a Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2788993 Change-Id: Id877c69b5da1c3c1a753911496548afa4ffbbf8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Update in folder structure for keymint am: 4b044ced8a am: f886799412 am: ↵suryaprakash.konduru
357b748298 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787540 Change-Id: I6cc7d530e47eed9270fbc42cb318f8a876ebdc3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Transport updated to support latest KM300, Weaver and IAR am: 88d813888f am: ↵suryaprakash.konduru
84945d38e2 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2788993 Change-Id: I0e9e28a97bad98a8df7d7e7c52d4bfdbb13d1e1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Update in folder structure for keymint am: 4b044ced8a am: f2fcb44136suryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787540 Change-Id: I2600bc8596ff9b2cfdd778ed7d305a770df487ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Transport updated to support latest KM300, Weaver and IAR am: 88d813888f am: ↵suryaprakash.konduru
4413446040 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2788993 Change-Id: If26a42192000546c53a9e68a69d265c889b95938 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Update in folder structure for keymint am: 4b044ced8a am: f886799412suryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787540 Change-Id: Ib0f9bce9dba37e31e5e63991416e7a12c32c8da5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Transport updated to support latest KM300, Weaver and IAR am: 88d813888fsuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2788993 Change-Id: I7896cec51c423ff9bd5fa7b1725873f7c6ad20cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Update in folder structure for keymint am: 4b044ced8asuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787540 Change-Id: I1f58a85d3a617321aee46513d66481fc62d1afd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Transport updated to support latest KM300, Weaver and IAR am: 88d813888fsuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2788993 Change-Id: Id931bab1afe538a1c436c2a93f598172ab74507c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Update in folder structure for keymint am: 4b044ced8asuryaprakash.konduru
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2787540 Change-Id: I728f88a40ea8f079edc3be5a6f19511dca4bfd12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20[automerger skipped] Do not log APDU contents am: 2a94557bdd am: f77795daaf ↵Todd Frederick
-s ours am: 090773296e -s ours am skip reason: Merged-In I8f9728ceb7c1a58b4e04f5976a924ea1aadc7f95 with SHA-1 2a94557bdd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2794572 Change-Id: I77be1fa6abca1c7bac4ce83fbff9d9d8b3dca78d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Do not log APDU contents am: 2a94557bdd am: f77795daaf ↵Todd Frederick
-s ours am skip reason: Merged-In I8f9728ceb7c1a58b4e04f5976a924ea1aadc7f95 with SHA-1 2a94557bdd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2794572 Change-Id: Ia63a63167463f18dc1d7957f59b01170e2d5d6fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Transport updated to support latest KM300, Weaver and IARsuryaprakash.konduru
- Static warning fixes - Other bug fixes Bug: 303346066 Test: Build ok Change-Id: Ic4e0c706cd108c2a3a286a15c4f2e60b5fd7e790
2023-10-19Update in folder structure for keymintsuryaprakash.konduru
- Moved keymint 2 implementation to "KM200" folder - "transport" folder keep it as common Bug: 303346066 Test: Build ok Change-Id: If48e67f2c11c4b172a263d8a2e848d2bb88c5db3
2023-10-19Snap for 10970117 from 58916583ef12febd8768fe7b9942e47f34be046f to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I6d7d7b2851bc7baf5926917304948b8f540fcd93
2023-10-17[automerger skipped] Do not log APDU contents am: 2a94557bdd am: 9d9d98bacf ↵Todd Frederick
am: 8c710174fc -s ours am skip reason: Merged-In I8f9728ceb7c1a58b4e04f5976a924ea1aadc7f95 with SHA-1 2195a1f9b1 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2794572 Change-Id: I8da39b73c177e90faef3ca92f7ce2e8fb484a5a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Do not log APDU contents am: 2a94557bdd am: 9d9d98bacfTodd Frederick
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2794572 Change-Id: If035d967631fde33cc5d06c6d5d57076553c3b66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Do not log APDU contents am: 2a94557bddTodd Frederick
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2794572 Change-Id: Iaab935fad1785518291beccd3b723b367fccb8e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Do not log APDU contents am: 2a94557bddTodd Frederick
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2794572 Change-Id: I769f6dee8f7d2fa61e3692bea671cd07d8d8c330 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge "Revert "Hold wakelock while logical channel is open"" into mainTodd Frederick
2023-10-17Do not log APDU contentsTodd Frederick
APDUs are logged by the SecureElement service on debug builds. Bug: 298116182 Bug: 297920301 Test: Check logs (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2195a1f9b1afd0bd8761e014fbe9118d45f08be4) Merged-In: I8f9728ceb7c1a58b4e04f5976a924ea1aadc7f95 Change-Id: I8f9728ceb7c1a58b4e04f5976a924ea1aadc7f95
2023-10-17Revert "Hold wakelock while logical channel is open"Todd Frederick
This reverts commit ecfc746de3edc966419bddead30ae0855a109fe7. Reason for revert: Will be replaced by fix for b/295559443 Bug: 291823699 Change-Id: I8f638c0c09a394e7e457d7eeaac3c8c7e8cac88b
2023-09-21Snap for 10843824 from 82a956dc5cf791ba121b82976ebb7af3033e3988 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I0e354c61aaf222dab97426671f74c09d40b6c866
2023-08-31Merge "Hold wakelock while logical channel is open" into mainTodd Frederick
2023-08-30Do not log APDU contentsTodd Frederick
APDUs are logged by the SecureElement service on debug builds. Bug: 298116182 Bug: 297920301 Test: Check logs Change-Id: I8f9728ceb7c1a58b4e04f5976a924ea1aadc7f95
2023-08-29Hold wakelock while logical channel is openTodd Frederick
The eSE will not power down if a logical channel is open, so hold a wakelock when holding a logical channel to prevent suspending the AP while the eSE stays on. Bug: 291823699 Test: Check eSE logs after boot Change-Id: I78acb8e7602d018450b81ee90d57727a6bd5d965 (cherry picked from commit 6c4155607d7759b0f8fccfdf7fcb263da9545c79)
2023-07-24Fix for KeyMint OmapiTransport interprets Weaver select am: dd69ac410c am: ↵nxf31698
c66a78345f am: de83dfe92b am: 979bdf190f am: 5a9f0f99da Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2670937 Change-Id: I95183f3d050a9050288fcc1b4ff52fd825a24167 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Fix for KeyMint OmapiTransport interprets Weaver select am: dd69ac410c am: ↵nxf31698
c66a78345f am: de83dfe92b am: 979bdf190f Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2670937 Change-Id: I99eeaf833b3bc338b343b5398e33a19c784360df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Fix for KeyMint OmapiTransport interprets Weaver select am: dd69ac410c am: ↵nxf31698
c66a78345f am: de83dfe92b Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2670937 Change-Id: I432178e103bc3a04496d846cf01e13674f551adf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Fix for KeyMint OmapiTransport interprets Weaver select am: dd69ac410c am: ↵nxf31698
c66a78345f Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2670937 Change-Id: Ife4279c18889f6acdc21f51d7a6f145aa44b3db4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Fix for KeyMint OmapiTransport interprets Weaver select am: dd69ac410cnxf31698
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2670937 Change-Id: Iccd3ebe45a221d2fe716ac250b62e4bb9069eebe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Fix for KeyMint OmapiTransport interprets Weaver selectplatform-tools-34.0.5nxf31698
response as KeyMint response Bug: 286661214 Test: Manual test Merged-In: Ifc7c150b741c7bd64db4eb9aa4929a7a5974797c Change-Id: I607de572b45ad620d52729275de4ed56472786d2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 00:20:10 +0000