aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-14Merge remote-tracking branch 'goog/upstream-primary' into ↵Chungjui Fan
chungjuifan-nos-merge-upstream am: a4ff6b85d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12374862 Change-Id: I35bbd8c0f488ed03f0ad879a192da654e384a78d
2020-08-14Merge remote-tracking branch 'goog/upstream-primary' into ↵Chungjui Fan
chungjuifan-nos-merge-upstream am: a4ff6b85d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12374862 Change-Id: Ic629e8c35d8ff19a0d7726fc9107eea7b65a460b
2020-08-14Merge remote-tracking branch 'goog/upstream-primary' into ↵Chungjui Fan
chungjuifan-nos-merge-upstream * goog/upstream-primary: Enlarge the timeout from 300 to 1200 msec Bug: 163076061 Test: succeed to finish factory reset 100 times Change-Id: I49d74816a30f7202bfdceb5459f0a03299c79e82
2020-08-13Enlarge the timeout from 300 to 1200 msecChungjui Fan
Wiping data can't be finished within 300 msec that leads the polling timeout APP_ERROR_IO while doing factory reset. Bug: 163076061 Test: succeed to finish factory reset 100 times Change-Id: Iee106ffc02db385270da605fad4119f31c8ec4cc Signed-off-by: Chungjui Fan <chungjuifan@google.com>
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 am: e47bf1f963 am: 3d6813ef17 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: I245d5cac0fd4c40a60c098857819a3bc32ed125f
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 am: 14c0e426a3 am: fd5e8f0c0c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: I858d49cb21f87609f3d3f764df442e74fbd34273
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 am: e47bf1f963 am: 2ba7ca721b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: I3960c1cd471562b08833afb9ccfa04d8d721b5cc
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 am: 14c0e426a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: I2e9843bee4f2cfc4bf9156601059bc3a950524a7
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 am: e47bf1f963 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: I94210e9a4dcc88854eaef11a7cfc0091d01d7db8
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 am: e47bf1f963 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: Ib32ca460c035e75256a24e116b8e485d503c78c7
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: I10683b5b2810545cc11ba3b7eb0fb2c734209a3f
2020-07-07Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: a1c2841380 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/12069418 Change-Id: Ibab9112dd2f64de2d3a0445c5aa36f40e9f50f20
2020-07-06Merge remote-tracking branch 'goog/upstream-master' into ↵android11-devjosephjang
josephjang-nos-merge-upstream * goog/upstream-master: Identity: Add two paramter in ICsetAuthTokenRequest Bug: 160198696 Bug: 160556107 Change-Id: I8c9e9c09153a471bac544a6cfc3bd139bbd5fc77
2020-07-03Identity: Add two paramter in ICsetAuthTokenRequestjosephjang
Per b/160198696, we need two more parameter "verificationTokenChallenge" and "verificationTokenSecurityLevel" for VerificationToken verification. Bug: 160198696 Test: CTS_Verifier Change-Id: I16b7d4cdc3413bd23b64fdbe8dda2994a4646549
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 am: d1476f7c7a am: 58ef59a2a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I98f0b185d39de0b184703ef3179dd0cf890e8374
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 am: ce233a1953 am: 636947c022 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: I6bbd6d918a0995cf33ace900f5796594f41d47d4
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 am: d1476f7c7a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I88860616f5307c8bb33d2b203a3b812f8cad5f5e
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 am: ce233a1953 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: Ia62a5fe8fcca945bb24dc8b477adcde7fc18a182
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 am: 9bec2d4144 am: feda6b09a0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I3575a35d7722ecd2a457c276e78114ba378fae2f
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 am: 9bec2d4144 am: f5d0aab9df Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I34173afef84d244073283c22a3476e9b1d0de3d3
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 am: 9bec2d4144 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I5fc749d322b998eb2001bd835d9cd317c67e1dff
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 am: 9bec2d4144 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I6070934c467d613bf1a756389cb02b0d07dc1aec
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I89c37754624012d398e057d9ad33345102be38b8
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: Ibc20785df90e7d35f84e738d864140058f8aee69
2020-06-26Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: 3f4723dce0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722 Change-Id: I6f57372c326fd889d79e3d9502d1e7b2419e3ee2
2020-06-25Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream * goog/upstream-master: CAVP: CMAC protos CAVP: Add CMAC proto, GCM success field Bug: 159947154 Bug: 159911243 Bug: 159911616 Change-Id: I74d55e37d1f73a3775b10d1e964a5ff6f7705c29
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 am: 8b9e81c950 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: I557916d0e41194957ba2147906631c5ef5332a5b
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 am: b7ffe72dad Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: I6e421a554d79384195dd3752cd6ebe1eddfc3ef7
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: If537b116ab4e84fdac13e94e1612b599ee4bd840
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: c937d5e6c4 am: 022b713246 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: Iab8c7d5763019b6be078659d27bd2e90682e63ab
2020-06-18CAVP: CMAC protosRoss Kettleson
Background: CMAC needs protos New Stuff: * Request, result protos Bug: 156130131 Test: Manual Signed-off-by: Ross Kettleson <kettro@google.com> Change-Id: I930bc03cc9628ddbd9502167e8f6f28fbef9c90c
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵dybertwang
dybertwang-nos-merge-upstream am: 0acb00db86 am: 99cb689080 am: e7ad2f9776 am: 3865ebfbf5 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11716893 Change-Id: I813c473b76e3242f83fc0763bde612aa8d192106
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06 am: ↵Bill Richardson
4738081a0c am: 5421cfb848 am: 9fa71ac894 am: d8f7689c9a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11332315 Change-Id: Ib71b3935b9fe8bc4fe45d289bc43f61de87591ec
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into wfrichar-MP-RVC-05 ↵Bill Richardson
am: c7589ee2ec am: 03df7eb9b4 am: f866249512 am: a7fdc2c9d0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11010603 Change-Id: I52cd20ad7c7b137dc5eb85b0b46bd92066ff515b
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵nagendra modadugu
ngm-nos-merge-upstream am: 5581f47fe9 am: 513d591f08 am: 0d1e514d0f am: cefa04702c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/10828487 Change-Id: If8ca3e47d1434f44206b24422be564939faa78b4
2020-06-18[automerger skipped] DO NOT MERGE: Merge remote-tracking branch ↵Automerger Merge Worker
'goog/upstream-qt-qpr1-dev' into dybertwang-nos-merge-upstream am: a3f77f82c8 -s ours am: aeadc01eed am: bdee6e01a9 am: 973a1b642a am: 0110f4ef96 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/10489941 Change-Id: I54e6646581c778d29b5e4fae3d8e1095b850e000
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: c937d5e6c4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: Ic41efad620ee01959a74d4fba26ba95ffa3ff4aa
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵dybertwang
dybertwang-nos-merge-upstream am: 0acb00db86 am: 99cb689080 am: e7ad2f9776 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11716893 Change-Id: I1649c47e58a31467bc0d1a6a6125d875e75aee93
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06 am: ↵Bill Richardson
4738081a0c am: 5421cfb848 am: 9fa71ac894 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11332315 Change-Id: I5f470162eb9c6ed184c7986692665fc127fcd497
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into wfrichar-MP-RVC-05 ↵Bill Richardson
am: c7589ee2ec am: 03df7eb9b4 am: f866249512 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11010603 Change-Id: I2edae2f65ba727a0c32d50be39e01e6540bf967f
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵nagendra modadugu
ngm-nos-merge-upstream am: 5581f47fe9 am: 513d591f08 am: 0d1e514d0f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/10828487 Change-Id: I524fc5728fd06588546bc6763618a791e4992cf5
2020-06-18[automerger skipped] DO NOT MERGE: Merge remote-tracking branch ↵Automerger Merge Worker
'goog/upstream-qt-qpr1-dev' into dybertwang-nos-merge-upstream am: a3f77f82c8 -s ours am: aeadc01eed am: bdee6e01a9 am: 973a1b642a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/10489941 Change-Id: I3dcb1a5985850238b7e2b1581055fc69dd352650
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 am: d5592ac112 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: I1412921c6235154c5dc69e1d93edbe9507ad7e58
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: I9b8d9caead8285b684b1e443ca161b7e5c549eb5
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵dybertwang
dybertwang-nos-merge-upstream am: 0acb00db86 am: 99cb689080 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11716893 Change-Id: Ic643fb13c5761c61699149d8f80a1e8f289e284d
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06 am: ↵Bill Richardson
4738081a0c am: 5421cfb848 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11332315 Change-Id: I84d2a00949c3b61b5e3ae7521976a4dac683c5c3
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into wfrichar-MP-RVC-05 ↵Bill Richardson
am: c7589ee2ec am: 03df7eb9b4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11010603 Change-Id: Ia056684d656eb5097e485556126d0d6712a910d7
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵nagendra modadugu
ngm-nos-merge-upstream am: 5581f47fe9 am: 513d591f08 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/10828487 Change-Id: I5cb212bc029530c18aae2ae8472e5d98496a63b6
2020-06-18[automerger skipped] DO NOT MERGE: Merge remote-tracking branch ↵Automerger Merge Worker
'goog/upstream-qt-qpr1-dev' into dybertwang-nos-merge-upstream am: a3f77f82c8 -s ours am: aeadc01eed am: bdee6e01a9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/10489941 Change-Id: I12c32324b34af0803fa66c24f95dac657ef732a3
2020-06-18Merge remote-tracking branch 'goog/upstream-master' into ↵josephjang
josephjang-nos-merge-upstream am: be4523fff7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11874040 Change-Id: I4d692a1219be9ff280025c28f19846b2441ed15e
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 19:59:01 +0000