aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-14Merge Android 12 QPR1android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918temp_sam_210511427temp-sc-samXin Li
2021-10-08[automerger skipped] Merge Android 12 am: 73d54361a1 -s ours am: cbd222f2ac -...Xin Li
2021-10-08[automerger skipped] Merge Android 12 am: 73d54361a1 -s ours am: cbd222f2ac -...Xin Li
2021-10-08[automerger skipped] Merge Android 12 am: 73d54361a1 -s oursXin Li
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-09-25Merge remote-tracking branch 'goog/upstream-master' into MP-SC-07 am: 66d171745cBill Richardson
2021-09-21Merge remote-tracking branch 'goog/upstream-master' into MP-SC-07android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseBill Richardson
2021-09-17AVB: Add a flag to store AP is just wiping statusTommy Chiu
2021-09-16Merge remote-tracking branch 'goog/upstream-master' into D2-SC-032 am: ac0347...Bill Richardson
2021-09-09Merge remote-tracking branch 'goog/upstream-master' into D2-SC-032Bill Richardson
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 606524...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 606524...Xin Li
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
2021-08-13keymint: Add GetPerFactoryResetValue for pKVMTommy Chiu
2021-07-27Fix uninitialized memory in nos_call_application()Bill Richardson
2021-07-27Fix pointer arithmetic in send_command()Bill Richardson
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ba775d...Xin Li
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 5ff63e6485 am: aa14bda39cXin Li
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 5ff63e6485Xin Li
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
2021-06-07Merge remote-tracking branch 'goog/upstream-master' into into D2-SC-023 and M...Joseph Jang
2021-05-28Merge remote-tracking branch 'goog/upstream-master' into into D2-SC-023 and M...android12-devJoseph Jang
2021-05-27Fix struct nugget_app_storage for C++Bill Richardson
2021-05-27keymint: Extend hmac_sharing_params max_count to 10Tommy Chiu
2021-05-25Merge remote-tracking branch 'goog/upstream-master' into D2-SC-022 am: 7ac056...Bill Richardson
2021-05-24Define NUGGET_PARAM_STORAGE_ functionsBill Richardson
2021-05-18Merge remote-tracking branch 'goog/upstream-master' into D2-SC-022Bill Richardson
2021-05-15keymint: introduce TagType::BIGNUMTommy Chiu
2021-05-14Add NUGGET_PARAM_TRIGGER_PIN for test purposesBill Richardson
2021-05-12Add new fields to the stats commandBill Richardson
2021-05-11Backport license stuff in Android.bp filesBill Richardson
2021-04-29sjtag: Add a new command to get SJTAG_ALLOWJoseph Jang
2021-04-29Merge remote-tracking branch 'goog/upstream-master' into D2-SC-020 am: 717b73...Bill Richardson
2021-04-20Merge remote-tracking branch 'goog/upstream-master' into D2-SC-020Bill Richardson
2021-04-20keymint: Add new Tag and KeyPurposeTommy Chiu
2021-04-07Merge remote-tracking branch 'goog/upstream-master' into nos2-2Bill Richardson
2021-04-07MockNuggetClient: add Reset method to mockKenny Root
2021-03-18Define UPGRADE_EN_FW_FAIL for upgrade stateChungjui Fan
2021-03-17sjtag: add new command for sjtag user consent cfgJoseph Jang
2021-03-17identity: Add support NDK version 3 for Andorid 12Joseph Jang
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s ours am: 784015c...Xin Li
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s ours am: 784015c...temp_ab_7272582Xin Li
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s oursXin Li
2021-03-03Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li
2021-03-02Merge RQ2A.210305.007 into stage. am: 7bf0c6dfd5 am: ad6d330db9Xin Li
2021-03-02Merge RQ2A.210305.007 into stage. am: 7bf0c6dfd5Xin Li
2021-03-01Merge RQ2A.210305.007 into stage.temp_RQ2A.210305.007Xin Li
2021-03-01[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 680ef...Xin Li