diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-06-23 11:17:23 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-25 14:47:31 +0000 |
| commit | 0776fb3aab035d32fd1148627953e2aedd08c987 (patch) | |
| tree | 46bcf923c3dc9a2b627c42b5d7da7de44fa736e3 /tests | |
| parent | be49fbfdf0b08df8e8a840aad1b91b4a7b6010db (diff) | |
| download | vboot-0776fb3aab035d32fd1148627953e2aedd08c987.tar.gz | |
vboot: add vb2api_phone_recovery_ui_enabled()stabilize-quickfix-13310.91.Bstabilize-quickfix-13310.76.Bstabilize-quickfix-13310.73.Bstabilize-13310.99.Bstabilize-13310.94.Bstabilize-13310.83.Bstabilize-13310.74.Bstabilize-13310.72.Brelease-R85-13310.B
Add a new flag VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_UI_DISABLED to
vb2_secdata_kernel_flags to separate phone recovery functionality from
UI instructions. Also add vb2api_phone_recovery_ui_enabled() to control
the UI behavior.
BRANCH=none
BUG=b:156532222
TEST=make runtests
Cq-Depend: chromium:2260155
Change-Id: Ib91a206e680ba2cb47762d8a5c0c0ce146918b7d
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2259632
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb2_kernel_tests.c | 4 | ||||
| -rw-r--r-- | tests/vb2_misc_tests.c | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c index 09ef7067..216776de 100644 --- a/tests/vb2_kernel_tests.c +++ b/tests/vb2_kernel_tests.c @@ -213,9 +213,11 @@ static void phase1_tests(void) " key data"); TEST_EQ(sd->kernel_version_secdata, 0x20002, " secdata_kernel version"); - /* Make sure phone recovery is enabled */ + /* Make sure phone recovery functionality is enabled, but UI disabled */ TEST_EQ(vb2api_phone_recovery_enabled(ctx), 1, " phone recovery enabled"); + TEST_EQ(vb2api_phone_recovery_ui_enabled(ctx), 0, + " phone recovery ui disabled"); /* Bad secdata_fwmp causes failure in normal mode only */ reset_common_data(FOR_PHASE1); diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index b82076f4..0f89ee51 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -839,6 +839,8 @@ static void phone_recovery_enabled_tests(void) vb2_secdata_kernel_init(ctx); TEST_EQ(vb2api_phone_recovery_enabled(ctx), 1, "phone recovery enabled"); + TEST_EQ(vb2api_phone_recovery_ui_enabled(ctx), 1, + " ui also enabled"); /* Phone recovery disabled */ reset_common_data(); @@ -848,6 +850,20 @@ static void phone_recovery_enabled_tests(void) VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_DISABLED); TEST_EQ(vb2api_phone_recovery_enabled(ctx), 0, "phone recovery disabled"); + TEST_EQ(vb2api_phone_recovery_ui_enabled(ctx), 0, + " ui also disabled"); + + /* Only UI disabled */ + reset_common_data(); + vb2api_secdata_kernel_create(ctx); + vb2_secdata_kernel_init(ctx); + vb2_secdata_kernel_set( + ctx, VB2_SECDATA_KERNEL_FLAGS, + VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_UI_DISABLED); + TEST_EQ(vb2api_phone_recovery_enabled(ctx), 1, + "phone recovery enabled again"); + TEST_EQ(vb2api_phone_recovery_ui_enabled(ctx), 0, + " ui disabled"); } static void dev_default_boot_tests(void) |