summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHsuan Ting Chen <roccochen@chromium.org>2020-08-28 17:17:53 +0800
committerCommit Bot <commit-bot@chromium.org>2020-08-29 13:51:33 +0000
commit9ab10a883cb485ab643375b502ff1609622e9f48 (patch)
tree3fa79dcdc9a0fdf1df94b19c17dec85649d8af3b
parente24a6f60c11ce3d616cb1932da6395a72c5b8bfd (diff)
downloadvboot-9ab10a883cb485ab643375b502ff1609622e9f48.tar.gz
vboot/ui: Fix handling error beep request without screen state change
Check the variable error_beep to handle the error beep request without screen state change. BRANCH=zork BUG=b:146399181 TEST=USE="menu_ui" emerge-zork depthcharge chromeos-bootimage TEST=Enter the debug info screen by <TAB>, select <Page up>, and notice a beep Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org> Change-Id: Id31fb06c37e2fee9b2eec1030cec06f22e7de854 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2379585 Commit-Queue: Yu-Ping Wu <yupingso@chromium.org> Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
-rw-r--r--firmware/2lib/2ui.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware/2lib/2ui.c b/firmware/2lib/2ui.c
index 8adfab80..1bdc2739 100644
--- a/firmware/2lib/2ui.c
+++ b/firmware/2lib/2ui.c
@@ -313,7 +313,9 @@ vb2_error_t ui_loop(struct vb2_context *ctx, enum vb2_screen root_screen_id,
/* We want to redraw when timer is disabled. */
prev_disable_timer != ui.disable_timer ||
/* We want to redraw/beep on a transition. */
- prev_error_code != ui.error_code) {
+ prev_error_code != ui.error_code ||
+ /* We want to beep. */
+ ui.error_beep != 0) {
menu = get_menu(&ui);
VB2_DEBUG("<%s> menu item <%s>\n",