aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Snap for 11400057 from b7becf5397e41ea243f508a39b7152126fcdd47a to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: Ia64106ca72938e6eb620f1c2d92ef16ae25e6e18
2023-11-22Snap for 11135399 from dd90c28669c925b384bf57d2f4f486641fb87ddb to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I3427605fe6d20a4971ddca57a7c745a2ca9c5113
2023-11-07Sandbox nos genrules am: dd90c28669Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2817933 Change-Id: Ied1287259cfff9231ba7ec867f88204de6073251 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03Sandbox nos genrulesCole Faust
go/roboleaf-busy-beavers-sandboxing Bug: 307824623 Test: m nos_app_avb_service_genc++ nos_app_avb_service_genc++_headers nos_app_avb_service_genc++_mock nos_app_identity_service_genc++ nos_app_identity_service_genc++_headers nos_app_identity_service_genc++_mock nos_app_keymaster_service_genc++ nos_app_keymaster_service_genc++_headers nos_app_keymaster_service_genc++_mock nos_app_weaver_service_genc++ nos_app_weaver_service_genc++_headers nos_app_weaver_service_genc++_mock nos_generator_test_service_genc++ nos_generator_test_service_genc++_headers nos_generator_test_service_genc++_mock Change-Id: Ibb40e23abc84a41d2a6ba3487cc73bc77dc36f43
2023-10-16Snap for 10957012 from 411f42ee236624b9267ed533a8298ac5d1d60172 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I51d346f65dc30020a6aca18dc155d82680857314
2023-10-06[automerger skipped] Merge Android 14 am: 411f42ee23 -s ours am: 435879b2fb ↵Xin Li
-s ours am: a8265effc7 -s ours am: 9d73da4f10 -s ours am skip reason: Merged-In I1a0b60a0324e4944c3956868747f2ae80102d701 with SHA-1 769eb9719b is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2777027 Change-Id: I83085d54cf243ea64a20aa10b4f23189871380a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 411f42ee23 -s ours am: 435879b2fb ↵Xin Li
-s ours am: a8265effc7 -s ours am skip reason: Merged-In I1a0b60a0324e4944c3956868747f2ae80102d701 with SHA-1 769eb9719b is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2777027 Change-Id: Iaa54ba497b77823702890678be9bfa3c0e0ee38e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 411f42ee23 -s ours am: 435879b2fb ↵Xin Li
-s ours am skip reason: Merged-In I1a0b60a0324e4944c3956868747f2ae80102d701 with SHA-1 769eb9719b is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2777027 Change-Id: Ic11808358484c4fe5b47a6efc1428d17106ca7de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 411f42ee23 -s oursXin Li
am skip reason: Merged-In I1a0b60a0324e4944c3956868747f2ae80102d701 with SHA-1 769eb9719b is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2777027 Change-Id: I57adfddf25477ce6d8f15eedc664b1ae605c8fe5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I1a0b60a0324e4944c3956868747f2ae80102d701 Change-Id: If0b9fbae0c2a46f8ecc0d4aadd58a18d16d7e320
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 9ed3d948d2 -s ours ↵Xin Li
am: 12ee368932 -s ours am: 34b54549ff -s ours am skip reason: Merged-In I471f36124dd23658ead8c54920e2eb9049103d73 with SHA-1 dedc068adf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/24182428 Change-Id: Ia3e9d916a47b028b9b950bf696252016a204d241 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 9ed3d948d2 -s ours ↵Xin Li
am: 12ee368932 -s ours am skip reason: Merged-In I471f36124dd23658ead8c54920e2eb9049103d73 with SHA-1 dedc068adf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/24182428 Change-Id: Icc73fef2ad769c2ba156e1b7b2f9ee93c89f58c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 9ed3d948d2 -s oursXin Li
am skip reason: Merged-In I471f36124dd23658ead8c54920e2eb9049103d73 with SHA-1 dedc068adf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/24182428 Change-Id: I746061d594cb5b2deac84bbf2d4e99cc72699727 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I471f36124dd23658ead8c54920e2eb9049103d73 Change-Id: I0c0c7274f61b9cf41d01a7a3891d73a68d3199e5
2023-07-20Snap for 10448490 from c3e1bcc586ce4824f4d2c873ff3ae786a8ad5740 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I562e688d87dd23f84c799c4beacf22ddbe9f3a3d
2023-05-25nugget: Add a app specific error code to reflect different state am: ↵Tommy Chiu
769eb9719b am: 1fdddeb368 am: c9f300e66b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I12b18c9c39b95a02e62889b887218b1ebe2b2c4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: ↵Tommy Chiu
769eb9719b am: dedc068adf am: ef26544f67 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I3028213c1dd1616d608a5f34bb3df9bc302d2ab1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: ↵Tommy Chiu
769eb9719b am: 1fdddeb368 am: e1f6568efc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: Icf7b760428b0a2ddf6e22cbaeda75d0fb7357c27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseTommy Chiu
769eb9719b am: 1fdddeb368 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I8fad882d8cf0fe95fb2a220a0d585afdf81078fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: ↵Tommy Chiu
769eb9719b am: dedc068adf Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: Ie6a6df3cc0f4b9986e32b3e5997762afb3941160 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: ↵Tommy Chiu
769eb9719b am: 1fdddeb368 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I874025d7c1aacf89d49c4a693ff9b8caa576ea87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: 769eb9719bTommy Chiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I0757c239f2c6fe776c2a21f727082035ccf70ee7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25nugget: Add a app specific error code to reflect different state am: 769eb9719bTommy Chiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I471f36124dd23658ead8c54920e2eb9049103d73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24nugget: Add a app specific error code to reflect different stateandroid14-devTommy Chiu
When flashing new firmware there was always one kind of error which is "LOCKED". Add a new NUGGET_ERROR_VERIFY to reflect the readback check failure. Bug: 261483407 Test: init_citadel Change-Id: I1a0b60a0324e4944c3956868747f2ae80102d701
2023-04-14Change the GSA NOS_CALL detction am: 8c73a14567Joseph Jang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/22563756 Change-Id: I8a650f01ac30c97dbe556d931b8b8da4e0b91aa7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Change the GSA NOS_CALL detctionJoseph Jang
This is a short term solution to allow Citadeld to correctly detect GSA new IOCTL interface and route Android data to GSA NOS_CALL handler. Bug: 255688398 Change-Id: I5a2db9ca8405fcbb1c46bba0f56f1bebe39da7f0
2023-04-07KM: Add SetSystemVersionInfoRequest.vendor_api_level definition am: fca163ade9Tommy Chiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/22508723 Change-Id: I89d4b269292b4065705369b4f4231cc955941f97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06KM: Add SetSystemVersionInfoRequest.vendor_api_level definitionTommy Chiu
We'll need to pass the vendor_api_level to TA for some attestation data encoding. Bug: 275394135 Test: VtsAidlKeyMintTargetTest Change-Id: I3276d064e83422952f7ac31554932cc12be6e1a8
2023-03-29Move libnos_datagram lib back to external/nos am: bb5734699dJoseph Jang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/22328247 Change-Id: Id90e675d4c8f226528cd610df9a0c92b32653e18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29Move libnos_datagram lib back to external/nosJoseph Jang
Since Android git_udc-dev-plus-aosp-without-vendor has no vendor image, so if we move libnos_datagram lib to vendor/google_nos, it will cause build break in git_udc-dev-plus-aosp-without-vendor. So move libnos_datagram lib back to external/nos as a short term solution. Bug: 275652569 Change-Id: I70b1560ac7a0d6edc2202b03cde7951bc51a28eb
2023-03-29Merge "Move Android libnos_datagram library to /host/android" into udc-dev ↵Joseph Jang
am: 063afb799e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/22246609 Change-Id: I3684c1aff3698576b772b87de97d005b1545ef4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28Merge "Move Android libnos_datagram library to /host/android" into udc-devJoseph Jang
2023-03-27Merge "Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-004" ↵TreeHugger Robot
into udc-dev am: f39a118b30 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/21922459 Change-Id: I4d09dc29aa3dc2ba46a922a8c8a7246f7cd5ce77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27Merge "Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-004" ↵TreeHugger Robot
into udc-dev
2023-03-24Move Android libnos_datagram library to /host/androidJoseph Jang
In order to customize libnos_datagram library for Android, move libnos_datagram to /host/android folder and have corresponding binary to link to /host/android/ libnos_datagram library. Bug: 255688398 Change-Id: Ic8b2db8e5c2ee8460952a1f48fa7782048c5f1b3
2023-03-15Snap for 9751898 from 74cd49e2334ea751e04674521a935a31e70020ec to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ia03d8a31e25b8aea7991298c50de7a793f4aa957
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s ours am: ↵Xin Li
e70fd865fe -s ours am: c3e1bcc586 -s ours am: 87de33ec4c -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: I20ed81cb15ca95d44bec5956cefde94a6b610966 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s ours am: ↵Xin Li
e70fd865fe -s ours am: c3e1bcc586 -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: I10d0e3bf7724220056242e42477b1285d4e69662 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s ours am: ↵Xin Li
e70fd865fe -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: Idd8058baeee414b72eafe45bf382aaf84bf9cb4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s oursXin Li
am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: I1f48541d5edf87503a3992cb552ea540f72d4f55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: Iab6f115a57b94a85e3c371bc8d7ebebbf552884c Change-Id: I0147f918353ac5952c2a02c5921199583d9206a9
2023-03-10Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-004Kevin Zhang
* goog/upstream-master: KM: Add ATTESTATION_ID_SECOND_IMEI definition Add Avb.GetCarrierLockName to expose carrier lock version. Bug: 269809537 Bug: 254287511 Bug: 262255219 Test: manual, QMC Change-Id: I698c697b8b6fb7be6f053a270f951a71cc51b4cc
2023-03-07KM: Add ATTESTATION_ID_SECOND_IMEI definitionTommy Chiu
Bug: 262255219 Test: VtsAidlKeyMintTargetTest, Change-Id: Idc07e44accffdcdaff83e4958d322b6f186d8658 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56826 Presubmit-Verified: Android Build Prod User <treehugger-gerrit@google.com> Reviewed-by: Lingyun Zhao <lingyunzhao@google.com> Tested-by: Tommy Chiu <tommychiu@google.com>
2023-03-02Add Avb.GetCarrierLockName to expose carrier lock version.Lingyun Zhao
go/pixel-gsc-avb-key-migration-dd Test: atest VtsHalOemLockTargetTest Bug: 254287511 Change-Id: Ie05b0b231bf55f829d6f9b46eef5060c7194eb3d Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/57265 Reviewed-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <treehugger-gerrit@google.com>
2023-02-24Snap for 9652768 from 17d98471e3f0acfc82ac768cc3cc15a8542f5683 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ia9796cab292f454180005b9b6319fc31053cea06
2023-02-17Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-003Lingyun Zhao
* goog/upstream-master: Change APP_ID_TEST to 0x7f secure_transport: Add secure link test command KM: Add second IMEI provisioning definition KM: Add multi-IMEI feature definition secure-transport: Add GSA-GSC secure channel usecase handshake command KM: Add GenerateRkpCsrV2 definition MockNuggetClient: Fix build break by adding new CallApp mock method Bug: 268566694 Bug: 268150153 Bug: 265199825 Bug: 262255219 Bug: 261705851 Bug: 201592534 Bug: 243454124 Bug: 263756493 Test: release tests, QMC Change-Id: I93ffd7b3a79c2060e1cdb03572f8ab95e791e8b9 Merged-In: I93ffd7b3a79c2060e1cdb03572f8ab95e791e8b9
2023-02-09Change APP_ID_TEST to 0x7fBill Richardson
The 0xff value conflicts with the APP_ID_NO_PROTO_FLAG, although I'm not certain anything uses it from this file. None of these APP_ID_*TEST definitions should be in here, really. Bug: None Test: None Change-Id: Id05d003fa9ad280bc44dc7908cc4639365ef6119 Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56945 Reviewed-by: Kevin Zhang <zhakevin@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2023-02-09secure_transport: Add secure link test commandJoseph Jang
Add secure link test command for CM factory team testing. Bug: 268150153 Change-Id: I0f6455c736043046c6c394d4433a17ba47517789 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56825 Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2023-02-07KM: Add second IMEI provisioning definitionTommy Chiu
Bug: 265199825 Change-Id: Id1630be7bdea668b73ceec0a1ffcbd5cec61ac65 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56524 Tested-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Autosubmit: Tommy Chiu <tommychiu@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Kevin Zhang <zhakevin@google.com>
2023-01-18KM: Add multi-IMEI feature definitionTommy Chiu
Keymint v3 requires to support multiple IMEI attestation. That'll involve changes including - ID provision in phone CM - ID attestation in TA Besides that, the duo-sku GSC on P23 makes things more complex. Add this feature map for a batter maintance. Bug: 262255219 Bug: 261705851 Test: build pass Change-Id: I234bf37777ec80c9ff3ecfca9cda8b42fa096d78 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56625 Autosubmit: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Lingyun Zhao <lingyunzhao@google.com> Tested-by: Tommy Chiu <tommychiu@google.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 10:45:10 +0000