aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-15Snap for 7550640 from 42c9a8b6aaece2868a7f23c36278f7a51f856778 to ↵android-mainline-12.0.0_r96android-mainline-12.0.0_r83android-mainline-12.0.0_r67android-mainline-12.0.0_r57android-mainline-12.0.0_r40android-mainline-12.0.0_r20android-mainline-12.0.0_r126android-mainline-12.0.0_r114aml_wif_311811030android12-mainline-wifi-releaseAndroid Build Coastguard Worker
mainline-wifi-release Change-Id: I9a1405febea4f3eecd5b1205279661bf11d312bc
2021-06-07Merge remote-tracking branch 'goog/upstream-master' into into D2-SC-023 and ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseJoseph Jang
MP-SC-02 am: 5ade74dfdb Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/14753975 Change-Id: Ie066c1dd44148319c212b35eeb957f2d9c2c97e5
2021-05-28Merge remote-tracking branch 'goog/upstream-master' into into D2-SC-023 and ↵android12-devJoseph Jang
MP-SC-02 Release notes: Fix struct nugget_app_storage for C++ keymint: Extend hmac_sharing_params max_count to 10 Define NUGGET_PARAM_STORAGE_ functions Bug: 189517156 Test: release tests, QMC Change-Id: I94328a13f1f1dd8fee8118e0916760b57eccf1ae
2021-05-27Fix struct nugget_app_storage for C++Bill Richardson
The C99 way to have zero-length arrays in a struct is "flexible array members", aka "variable length arrays". That's okay for C, but it's not part of C++ (although Clang claims to allow it). There are a few C++ programs that #include app_nugget.h, so we have to fix it up a bit. Bug: 173056823 Test: manual Change-Id: I0fb3d4afb27b71b7b0f8050d4b1f51f4e118514f Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/43864 Reviewed-by: Randall Spangler <rspangler@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-05-27keymint: Extend hmac_sharing_params max_count to 10Tommy Chiu
The restriction of hmac parameters used to be 3 however it turns to 4 on keystore2. There's no detail specification on the number, just extend to 10 to avoid surprise. Bug: 188728065 Test: VtsAidlSharedSecretTargetTest and boot to HOME Change-Id: I83f889a438fb305f93a21ef53460ccc036eab933 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/43644 Tested-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Randall Spangler <rspangler@google.com> Reviewed-by: Joseph Jang <josephjang@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com> Presubmit-Verified-Together: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-05-25Merge remote-tracking branch 'goog/upstream-master' into D2-SC-022 am: ↵Bill Richardson
7ac0566074 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/14635582 Change-Id: Ic413bbc31690a0115fed1b550e8055b9b1315810
2021-05-24Define NUGGET_PARAM_STORAGE_ functionsBill Richardson
This allows storage of a single variable-sized data blob by Nugget OS, for whatever purpose the AP may require. Nugget OS makes no use of it. Bug: 173056823 Test: manual Change-Id: Iecbaf9a89fa782ddc67e5d3f23d0cd117ea2458a Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/43626 Reviewed-by: Randall Spangler <rspangler@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-05-18Merge remote-tracking branch 'goog/upstream-master' into D2-SC-022Bill Richardson
Release notes: keymint: introduce TagType::BIGNUM Add NUGGET_PARAM_TRIGGER_PIN for test purposes Add new fields to the stats command Backport license stuff in Android.bp files sjtag: Add a new command to get SJTAG_ALLOW Bug: 188590600 Test: release tests, QMC Signed-off-by: Bill Richardson <wfrichar@google.com> Change-Id: I102b17d55facf8aa060b86078d33d2e2fb9f7e1d
2021-05-15keymint: introduce TagType::BIGNUMTommy Chiu
Rename to BIGNUM_ to avoid conflict name in openssl/base.h ``` test/system-test-harness/src/keymaster-import-key-tests.cc:465:9: error: reference to 'BIGNUM' is ambiguous const BIGNUM *d = EC_KEY_get0_private_key(ec.get()); ^ external/boringssl_git/src/include/openssl/base.h:369:26: note: candidate found by name lookup is 'BIGNUM' typedef struct bignum_st BIGNUM; ``` Change-Id: If4088141b35259c375c1abba7b84ae4851ebeccd Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/42804 Tested-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: I-Chih Lu <ichihlu@google.com>
2021-05-14Add NUGGET_PARAM_TRIGGER_PIN for test purposesBill Richardson
Bug: 187991056 Test: manual Signed-off-by: Bill Richardson <wfrichar@google.com> Change-Id: Ic34454930c86b09f8821b0072f46ea911c7f926e Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/43192 Reviewed-by: Randall Spangler <rspangler@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-05-12Add new fields to the stats commandBill Richardson
This adds the temp and pin state to the stats command. Bug: 187544290 Test: manual Signed-off-by: Bill Richardson <wfrichar@google.com> Change-Id: I112249046b3633c8dce74419aef4ab1f9dbea466 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/43089 Reviewed-by: Randall Spangler <rspangler@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-05-11Backport license stuff in Android.bp filesBill Richardson
Import this change from goog/sc-dev: commit f7878ea Author: Bob Badour <bbadour@google.com> Date: Fri Feb 12 14:47:58 2021 -0800 [LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic Added SPDX-license-identifier-Apache-2.0 to: libnos/Android.bp libnos/generator/Android.bp libnos/generator/test/Android.bp libnos/test/Android.bp libnos_datagram/Android.bp libnos_transport/Android.bp nugget/proto/nugget/app/avb/Android.bp nugget/proto/nugget/app/identity/Android.bp nugget/proto/nugget/app/keymaster/Android.bp nugget/proto/nugget/app/weaver/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp nugget/proto/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Signed-off-by: Bill Richardson <wfrichar@google.com> Change-Id: I79d9cdba2ab36229274cd4d572606f171c40506b Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/42925 Reviewed-by: Randall Spangler <rspangler@google.com>
2021-04-29sjtag: Add a new command to get SJTAG_ALLOWJoseph Jang
Bug: 185860435 Change-Id: I5310f4652a8504d3f9ba908e5a6cb998de10bba9 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/41844 Tested-by: Joseph Jang <josephjang@google.com> Reviewed-by: Randall Spangler <rspangler@google.com> Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-04-29Merge remote-tracking branch 'goog/upstream-master' into D2-SC-020 am: ↵Bill Richardson
717b735671 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/14254548 Change-Id: If9e080ef4ca9e6a69d35e93b83c1f0f7d1cd9020
2021-04-20Merge remote-tracking branch 'goog/upstream-master' into D2-SC-020Bill Richardson
* goog/upstream-master: keymint: Add new Tag and KeyPurpose Bug: 161929178 Test: release tests, QMC Change-Id: Iaca4488cdcccbc9dab3cc07b647c408af855e495
2021-04-20keymint: Add new Tag and KeyPurposeTommy Chiu
Bug: 161929178 Change-Id: Ib6c294ecd2335acad53a45191891fda7cf30c232 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/41464 Tested-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Randall Spangler <rspangler@google.com> Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
2021-04-14Merge remote-tracking branch 'goog/upstream-master' into nos2-2 am: edbbb4737cBill Richardson
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13973691 Change-Id: Idac2545fd0f8788fc23b4d6d1ce0558e98a16cd6
2021-04-07Merge remote-tracking branch 'goog/upstream-master' into nos2-2Bill Richardson
* goog/upstream-master: MockNuggetClient: add Reset method to mock Define UPGRADE_EN_FW_FAIL for upgrade state sjtag: add new command for sjtag user consent cfg identity: Add support NDK version 3 for Andorid 12 Tweak: fix typos in debug strings Refactor NuggetClient a bit Bug: 170775487 Bug: 178353028 Bug: 181691419 Test: release tests, QMC Change-Id: I03dc7c270939fc049350eac4ab4625f7f74c37be
2021-04-07MockNuggetClient: add Reset method to mockKenny Root
Bug: None Test: cherry-pick to Android tree Signed-off-by: Kenny Root <kroot@google.com> Change-Id: Id2b0396db852b17b48637e7178451742c7b17d2d Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/41664 Tested-by: Bill Richardson <wfrichar@google.com> Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: TreeHugger Robot
2021-03-18Define UPGRADE_EN_FW_FAIL for upgrade stateChungjui Fan
Test: Build pass Bug: 170775487 Change-Id: I09b1e36d313805cb9d2112b56ea886b3ba0abd65 Signed-off-by: Chungjui Fan <chungjuifan@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/41046 Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: TreeHugger Robot
2021-03-17sjtag: add new command for sjtag user consent cfgJoseph Jang
Add a new command in nugget_task to get/set sjtag user consent cfg. Note: Will set sjtag cfg to 1 (ALLOW) after factory reset. Bug: 181691419 Test: fastboot oem gsc sjtag-cfg Change-Id: I18456d8c6fa8f02b4ea7dd19b69494fac25dacbc Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/40964 Tested-by: Joseph Jang <josephjang@google.com> Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: TreeHugger Robot
2021-03-17identity: Add support NDK version 3 for Andorid 12Joseph Jang
Bug: 178353028 Change-Id: Ia4c041c6dba96c1240d825ee6fb27f56d1a8b9d2 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/39584 Tested-by: Joseph Jang <josephjang@google.com> Reviewed-by: Randall Spangler <rspangler@google.com> Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: TreeHugger Robot
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s ours am: ↵Xin Li
784015c005 -s ours am: 6c40fd2fc3 -s ours am: 665d130484 -s ours am skip reason: Change-Id Ice657878ab1d86ff70f642257be4a6e24cbe611c with SHA-1 7bf0c6dfd5 is in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1611852 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib6b8544e2d33b0b9942599195ccd3c1804f1c6f3
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s ours am: ↵Xin Li
784015c005 -s ours am: 6c40fd2fc3 -s ours am skip reason: Change-Id Ice657878ab1d86ff70f642257be4a6e24cbe611c with SHA-1 7bf0c6dfd5 is in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1611852 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I697a69f03c1d998db44ebfc8bc3c624fdcad68c3
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s ours am: ↵temp_ab_7272582Xin Li
784015c005 -s ours am skip reason: Change-Id Ice657878ab1d86ff70f642257be4a6e24cbe611c with SHA-1 7bf0c6dfd5 is in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1611852 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieaf54f4836fb1125be045b5517e7f75582bccfe2
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 955766f653 -s oursXin Li
am skip reason: Change-Id Ice657878ab1d86ff70f642257be4a6e24cbe611c with SHA-1 7bf0c6dfd5 is in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1611852 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I806202a3b93c282105858fa33c4759c669da8262
2021-03-03Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: Ice657878ab1d86ff70f642257be4a6e24cbe611c Change-Id: Ie65de513d1bec1448fb49585da4e6af66ff97fe2
2021-03-02Merge RQ2A.210305.007 into stage. am: 7bf0c6dfd5 am: ad6d330db9 am: 62ce56a760Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13724677 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0c4bff55328666650faf30d94375ad7bc205478
2021-03-02Merge RQ2A.210305.007 into stage. am: 7bf0c6dfd5 am: ad6d330db9Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13724677 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2381e8973de3ac76d06a1113e0fc02d48a803ccb
2021-03-02Merge RQ2A.210305.007 into stage. am: 7bf0c6dfd5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13724677 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I88e1cc8564c3d42183c9eb216faa20a80158e324
2021-03-01Merge RQ2A.210305.007 into stage.temp_RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: Icc631e40fefe6dccf1c76964187d45ee12fda4fa Change-Id: Ice657878ab1d86ff70f642257be4a6e24cbe611c
2021-03-01[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: ↵Xin Li
680ef5994e -s ours am: 4f17069858 -s ours am: ebf46bdf7a -s ours am skip reason: Change-Id I65ec74e65bd45dbcf2f7508b87a97f6cb8c6dd80 with SHA-1 c8a7d12477 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0f59b30b1a2b168cccfa20315510ae690a16bad9
2021-03-01[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: ↵Xin Li
680ef5994e -s ours am: 4f17069858 -s ours am skip reason: subject contains skip directive Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia5c97e3badcfa7ddd6062e245735627690640b73
2021-03-01[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: ↵Xin Li
680ef5994e -s ours am skip reason: Change-Id I65ec74e65bd45dbcf2f7508b87a97f6cb8c6dd80 with SHA-1 c8a7d12477 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id18c59ef348ffc2a112c78d4039ec15e568dc4ae
2021-03-01DO NOT MERGE - Mark RQ2A.210105.001 as merged.Xin Li
Bug: 180401296 Merged-In: I65ec74e65bd45dbcf2f7508b87a97f6cb8c6dd80 Change-Id: Ibe9d43150f79d2439199f4e271b513d90714a83f
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: c8a7d12477 -s ours am: ↵Xin Li
305894d8dc -s ours am: 803f2ae12a -s ours am skip reason: Change-Id Ic410d3ccf27fbe7a542b6de4472212328c2dd87b with SHA-1 bc623b1592 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13658367 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id911831dbced5673790e6f7f76ea7c2c221efcdd
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: c8a7d12477 -s ours am: ↵Xin Li
305894d8dc -s ours am skip reason: Change-Id Ic410d3ccf27fbe7a542b6de4472212328c2dd87b with SHA-1 bc623b1592 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13658367 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a0169df7d15fbd840fd0e0ef7c8b3b932508109
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: c8a7d12477 -s oursXin Li
am skip reason: Change-Id Ic410d3ccf27fbe7a542b6de4472212328c2dd87b with SHA-1 bc623b1592 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13658367 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id4628e7b99b6161cf3fca13d8fd81911aceff1d4
2021-02-21Merge ab/7061308 into stage.Xin Li
Bug: 180401296 Merged-In: Ic410d3ccf27fbe7a542b6de4472212328c2dd87b Change-Id: I65ec74e65bd45dbcf2f7508b87a97f6cb8c6dd80
2021-02-20Tweak: fix typos in debug stringsBill Richardson
Bug: None Test: None Change-Id: I922758e7c64caa339b1ce03eb5e44e3c685ead72 Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/40284 Presubmit-Verified: TreeHugger Robot
2021-02-19Refactor NuggetClient a bitBill Richardson
The NuggetClientInterface class should provide all we need for both Android and Linux desktop tools. Instead it's sort of an idealized view with ugly details left to two separate child classes to figure out. This cleans things up (some) to make building tests for both enviroments a little simpler. Bug: None Test: build everything, test everything Change-Id: I38d5af2de47625d1e8d3d2b929f9157b12bbd09d Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/40224 Reviewed-by: Randall Spangler <rspangler@google.com> Presubmit-Verified: TreeHugger Robot
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653 ↵Bob Badour
am: 440f7332f7 am: 165e6a9eca am: 72a82dc5b7 Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1588626 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4537e442f3afc17712215a741fb39a8696e72d45
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653 ↵Bob Badour
am: 440f7332f7 am: 165e6a9eca Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1588626 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6f0f81f9916a92df8a7b350101697d2937c0e96
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653 ↵Bob Badour
am: 440f7332f7 Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1588626 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4ae8b40325d5ad57b751386e643a73c745c305a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1588626 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I958ca6007b18f56dc6095d48301d54541afde88f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/genericandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: libnos/Android.bp libnos/generator/Android.bp libnos/generator/test/Android.bp libnos/test/Android.bp libnos_datagram/Android.bp libnos_transport/Android.bp nugget/proto/nugget/app/avb/Android.bp nugget/proto/nugget/app/identity/Android.bp nugget/proto/nugget/app/keymaster/Android.bp nugget/proto/nugget/app/weaver/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp nugget/proto/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I81ad1b4c58c6d57550857471dc894063619162c3
2021-01-14Merge cherrypicks of [13343779, 13343968, 13343886, 13343395, 13341216, ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot
13343957, 13343958, 13343762, 13343763, 13343764, 13344125, 13344126, 13344127, 13344128, 13344129, 13344130, 13344131, 13343396, 13343780, 13343781, 13343782, 13343783, 13343784, 13344185, 13343959, 13343960, 13343961, 13343962, 13343963, 13343964, 13344205, 13344206, 13344207, 13344208, 13344209, 13344186, 13343969, 13343970, 13343971, 13343972, 13343973, 13343974, 13343975, 13343918, 13343919, 13343976, 13343397, 13344187] into rvc-qpr2-release Change-Id: I0eb89824dfd1f4c61c224c385014abcd1c690c93
2021-01-14Merge remote-tracking branch 'goog/upstream-rvc-qpr2' into MP-RVC-14mBill Richardson
* goog/upstream-rvc-qpr2: Add NuggetClientDebuggable class for testing Limit MAC sizes for ICsetAuthTokenRequest in *.options Bug: 174769927 Bug: 175116439 Bug: 175117199 Bug: 175262410 Test: Manual, release tests, QMC Change-Id: Icc631e40fefe6dccf1c76964187d45ee12fda4fa (cherry picked from commit f8fd15488570b5f49d9449458a8c2be899af157d)
2021-01-11Merge remote-tracking branch 'goog/upstream-master' into D2-SC-017Bill Richardson
* goog/upstream-master: Add NuggetClientDebuggable class for testing cleanup: fix typo in comment Limit MAC sizes for ICsetAuthTokenRequest in *.options proto: Add product certs ID for dauntless identity: Add one more parameter to customize attest name Bug: 165285749 Bug: 172022134 Bug: 174769927 Bug: 175116439 Bug: 175117199 Bug: 175262410 Test: release tests, QMC Change-Id: I470b5a7d8e5aa9fbc13c5a2096eba44baecbe236
2021-01-08Merge remote-tracking branch 'goog/upstream-rvc-qpr2' into MP-RVC-14m am: ↵Bill Richardson
f8fd154885 am: 211841f683 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/13296513 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0eb14cad40dea29726d048a3d23b4a0e1be85806
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 14:02:26 +0000