aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Id5785b498d8cc341cea8c4f7a69e6cd469fcbae2
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵temp_140451723Xin Li
(PPRL.190705.004) into master am: 8b2d90441c -s ours am skip reason: subject contains skip directive Change-Id: I440ac73334ec9ddcdc35ed22ef9f697454fe7fd2
2019-07-09DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterXin Li
Bug: 136196576 Change-Id: Ic7b3ab0e0a8ba5a2d821df414022ba265713ec47
2019-07-08Snap for 5622519 from 48c68c688044cad7cf7062ef9728f6b930f7c203 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I65071ac001a5d8cb1f9bcf2f16830919c53bd4ea
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I31366de5331e1b8a0810f7c0b67fc3bf2f464708
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 2a23038216 -s ours am: a68dee706e -s ours am skip reason: subject contains skip directive Change-Id: I66c60cb94eebf174fc7a5f7f081a65a52402a11a
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 2a23038216 -s ours am skip reason: subject contains skip directive Change-Id: Ie7a288f9d1d529a7c20f2d6f6ca9831bbf553613
2019-05-15[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 56a8151f8f -s ours am skip reason: subject contains skip directive Change-Id: I9e0c517ca99e8b8ea62c8690e28edec323cd72e2
2019-05-15DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.Xin Li
Bug: 132622481 Change-Id: Ide28e6ccab389393b61bf22f64932b15104536d0
2019-05-13DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into ↵temp_b_132622481_stage-aosp-masterXin Li
stage-aosp-master Bug: 132622481 Change-Id: I47f38925bccde09a88aa63acf104ce7146f5e501
2019-05-09Merge remote-tracking branch 'goog/upstream-master' into doodle_wip8Garret Kelly
am: dfb8ac6090 Change-Id: I5fbed5dae6c94ed93df724d9537cca5559ba0081
2019-05-08Merge remote-tracking branch 'goog/upstream-master' into doodle_wip8android10-devGarret Kelly
* goog/upstream-master: src/faceauth_tests.cc: return profile id stored faceauth_tests: add firmware incompatibility tests faceauth_tests: add version mismatch test release-tests.sh: enable keystore CTS tests faceauth_tests: interface change Bug: 128111918 Bug: 128981297 Bug: 129159434 Bug: 129268150 Bug: 130304269 Bug: 132201532 Test: manual Change-Id: Id64c0b779a0b32b9c43b088d4e2ba36db94b398f
2019-05-07src/faceauth_tests.cc: return profile id storedJi Soo Shin
We have AuthToken now. We do not have a good way of testing AuthToken itself (mac); however, this does allows us to implement additional feature which is userID to profileID mapping. This adds tests to make sure the mapping is maintained by citadel correctly. Bug: 128981297 Test: bazel Change-Id: Ic4767450aeed00f80a9a28879704172860aec10a Signed-off-by: Ji Soo Shin <jisshin@google.com>
2019-05-07Snap for 5450365 from ab56abb4e98cefe99426d2f96c2d37c03124d15a to ↵android-build-team Robot
pi-platform-release Change-Id: I9fed2f00901293aa003e599f14ea0ad757cc2b45
2019-04-17faceauth_tests: add airbrush firmware incompatibility testsJi Soo Shin
Must return FACEAUTH_ERR_VERSION if airbrush firmware is too old Bug: 129159434 Test: bazel, coral Change-Id: I88239258efbf94df958085f7a397b7d8296b51af Signed-off-by: Ji Soo Shin <jisshin@google.com>
2019-04-16faceauth_tests: add version mismatch testJi Soo Shin
Check if citadel faceauth detects comparison of embeddings that have different versions. Bug: 130304269 Test: bazel Change-Id: Icd18b1feed1e4fe118cefa56206ea0c9d44d3de0 Signed-off-by: Ji Soo Shin <jisshin@google.com>
2019-04-08release-tests.sh: enable keystore CTS testsnagendra modadugu
Enable keystore CTS tests, which were previously not run at all. Bug: 129268150 Test: pending Change-Id: Ib3229b392c358934a3cf27d3af36c1ec1fc1576c Signed-off-by: nagendra modadugu <ngm@google.com>
2019-04-03Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
am: 023d9b1629 Change-Id: Ifce4b4413302fae1c7efe8e3bbb48ec5617aa490
2019-04-02faceauth_tests: interface changeJi Soo Shin
Bug: 128111918 Test: jenkins Change-Id: I1e72f79e23cf0944d171a0c6cf68b0e9ac59c70b Signed-off-by: Ji Soo Shin <jisshin@google.com>
2019-03-29Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Ic5e86ef8411f352e28600bc3f15c27f2ebe7c8f0 BUG: 129345239
2019-03-19Merge remote-tracking branch 'goog/upstream-master' into doodle_releaseBill Richardson
* goog/upstream-master: faceauth_tests.cc: security update tests Change-Id: I21ae9140ab807762892c72e12af81fe4dc039093
2019-03-14faceauth_tests.cc: security update testsJi Soo Shin
Change-Id: I9cf4b9a1d32883c456c86be8feae33fcb5c52660
2019-03-06Merge remote-tracking branch 'goog/upstream-master' into bill-releaseBill Richardson
* goog/upstream-master: faceauth_tests.cc: add exhaustive test Change-Id: I5b4e2b7d90dd558285d590601ba8dc8b1b09bc3d
2019-02-27Snap for 5339334 from 1410f65a869282fff15a79e0bc14469290ba66ae to ↵android-9.0.0_r46android-9.0.0_r44android-9.0.0_r43android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releaseandroid-build-team Robot
pi-qpr3-release Change-Id: I53d6cd1a308a40135c71e531ccbc81e30add0a42
2019-02-26Snap for 5335558 from 1410f65a869282fff15a79e0bc14469290ba66ae to ↵android-9.0.0_r47android-9.0.0_r45android-9.0.0_r42pie-qpr3-b-releaseandroid-build-team Robot
pi-qpr3-b-release Change-Id: I6e0e113ff9882b9cf2c346a0132ef936d3a8df69
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into ↵Xin Li
stage-aosp-master am: bf56d241ef -s ours am: 27bd08ac28 -s ours am skip reason: subject contains skip directive Change-Id: I35db5978dc49fadf80fd48f6768688b18b8cb119
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: bf56d241ef -s ours am skip reason: subject contains skip directive Change-Id: Idaf710fd3934754c3f3059271ab0a075e7628481
2019-02-22[automerger skipped] [DO NOT MERGE] Merge remote-tracking branch ↵nagendra modadugu
'goog/upstream-pixel18' into ngm-ota-rc11 am: 1410f65a86 am: fddbf912ce -s ours am skip reason: subject contains skip directive Change-Id: I96fc3ede30fb5387b306f85e8b63c51bb414b189
2019-02-22[DO NOT MERGE] Merge remote-tracking branch 'goog/upstream-pixel18' into ↵nagendra modadugu
ngm-ota-rc11 am: 1410f65a86 Change-Id: I550e376f1c3dcbace6f75f05b57a2bbd4213b1ac
2019-02-22[DO NOT MERGE] Merge remote-tracking branch 'goog/upstream-pixel18' into ↵nagendra modadugu
ngm-ota-rc11 * goog/upstream-pixel18: WORKSPACE: Roll protobuf to latest point release Quick hack to fix bazel release-tests: remove stale TODO release-tests: re-enable filtered keymaster test Bug: 122375834 Bug: 119541233 Test: pending Change-Id: Idd1c800a2ddfd9c634255991ed702fccbc3a4361
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I348e1256e8faa8ad0260e1ccfbf8ba26f4d7ebf2
2019-02-07faceauth_tests.cc: add exhaustive testJi Soo Shin
Change-Id: Ib96e92b457556d5d7d456b4bc10d20ea78c7a0c8
2019-01-25Merge remote-tracking branch 'goog/upstream-master' into bill-nos-merge-upstreamBill Richardson
* goog/upstream-master: test/system-test-harness: Upgrade googletest to 1.8.1 WORKSPACE: Roll protobuf to latest point release Quick hack to fix bazel Bug: 78508518 Test: manual Change-Id: I1785d7495bd66d187954272cc02a3d450e370278 Signed-off-by: Bill Richardson <wfrichar@google.com>
2019-01-24test/system-test-harness: Upgrade googletest to 1.8.1Garret Kelly
The new 1.8.1 release has its own BUILD.bazel and doesn't require an overridden build file. Bug: 123083638 Test: bazel build :all Change-Id: I3afe26dc42a41dd781ffd1d61f93493a584e0a72 Signed-off-by: Garret Kelly <gdk@google.com>
2019-01-14WORKSPACE: Roll protobuf to latest point releaseGarret Kelly
Bazel made an incompatible change to the handling of the REPOSITORY_NAME variable. Only protobuf-3.6.1.2 has a fix for their BUILD file that no longer uses this variable. Bug: 122851705 Test: manually rebuilt Change-Id: Icb78d0ca957984c10fb25248e033964438d18648 Signed-off-by: Garret Kelly <gdk@google.com>
2019-01-14WORKSPACE: Roll protobuf to latest point releaseGarret Kelly
Bazel made an incompatible change to the handling of the REPOSITORY_NAME variable. Only protobuf-3.6.1.2 has a fix for their BUILD file that no longer uses this variable. Bug: 122851705 Test: manually rebuilt Change-Id: Icb78d0ca957984c10fb25248e033964438d18648 Signed-off-by: Garret Kelly <gdk@google.com>
2019-01-07Quick hack to fix bazelBill Richardson
Bug: 120439631 Test: blow things away, build them again From the top: pushd core/nugget bazel clean --expunge bazel build unit_tests popd pushd host/linux/citadel/updater bazel clean --expunge bazel build citadel_updater popd pushd test/system-test-harness bazel clean --expunge bazel build runtests popd Change-Id: I43abfc414b56935646f7bb7303b8eff51f40be7e Signed-off-by: Bill Richardson <wfrichar@google.com> (cherry picked from commit 400a305057f2341132cc3e8c8b47ea37a6679e99)
2019-01-05Add default active developers into OWNERS am: 8829ced538 am: 52651d18b4Chih-Hung Hsieh
am: f81eefcbb3 Change-Id: If735d3cf17bd716ef290656c4d4cbf9dfb26b74c
2019-01-05Add default active developers into OWNERS am: 8829ced538Chih-Hung Hsieh
am: 52651d18b4 Change-Id: I3001b5a59f820338633e59feb99d1d66315f867d
2019-01-05Add default active developers into OWNERSChih-Hung Hsieh
am: 8829ced538 Change-Id: Ie7247a06c83db09c04d58bce85da438dd7475376
2019-01-04Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ib584ee86db8b373bbddbf88bb336490156098690
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: 0fbb25006e -s ours am: c841fc64a5 -s ours am: db2d781f1b -s ours Change-Id: I217737f18fa50afb17adee240ca6d4a915a128bb
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: 0fbb25006e -s ours am: c841fc64a5 -s ours Change-Id: I81bb6f6fc44b7490eb97d76ec0c4b6a192237799
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: 0fbb25006e -s ours Change-Id: Icf2dd5b08380ed55c97e6acf17849000abb9cec9
2018-12-11[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into stage-aosp-master am: 3d515737ad -s ours am: a6aa6b8b7a -s ours Change-Id: Ie7f1d5c97334679ec8e04ce9a909d35f4887b271
2018-12-11[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into stage-aosp-master am: 3d515737ad -s ours Change-Id: Id613e7a838c0852e769044111b6f4412a9cf5880
2018-12-11DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li
Bug: 120502534 Change-Id: I4ad02c3766f2927894c6b81b80165b86ee141cc0
2018-12-11DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into ↵Xin Li
stage-aosp-master Bug: 120502534 Change-Id: I4d22a3793e4a65b2a056e4fb9e1a5f03e89165b4
2018-12-03Quick hack to fix bazelBill Richardson
Bug: 120439631 Test: blow things away, build them again From the top: pushd core/nugget bazel clean --expunge bazel build unit_tests popd pushd host/linux/citadel/updater bazel clean --expunge bazel build citadel_updater popd pushd test/system-test-harness bazel clean --expunge bazel build runtests popd Change-Id: I43abfc414b56935646f7bb7303b8eff51f40be7e Signed-off-by: Bill Richardson <wfrichar@google.com>
2018-11-30Merge remote-tracking branch 'goog/upstream-master' into bill-nos-mergeBill Richardson
Bug: none Test: pending * goog/upstream-master: faceauth_tests: add crc related tests faceauth_tests.cc: enhance valid profile ID tests FaceAuth: fix misnomer s/user/profile/g faceauth: add faceauth tests Enforce well-formatted source and commit messages release-tests: remove stale TODO release-tests: re-enable filtered keymaster test Change-Id: I03f882a69a60ea7254a8f32bcd1f7e5d9ee9d888
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 02:35:18 +0000