summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShelley Chen <shchen@chromium.org>2017-03-16 10:34:30 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2017-06-05 18:05:37 +0000
commite9fb9cb30a4d3b7ad54b9da8fc002b21a39d01a2 (patch)
tree5128cd0ca6d93b9cbbe178b9a26752364c27d506
parent34572572d3669c9aa182eb12983c3e2c5fdaa2e9 (diff)
downloadvboot-e9fb9cb30a4d3b7ad54b9da8fc002b21a39d01a2.tar.gz
detachables: Reset timer every time user moves the cursor
In dev mode, after 30 seconds of inactivity, we'll get the usual loud beep and automatic boot from disk. BUG=b:35585623 BRANCH=None TEST=reboot and make sure that fw screen timeout only occurs after 30 seconds of inactivity. Change-Id: Id7104ba6aa7ddda85a386ae71e5797af65e78ebf Signed-off-by: Duncan Laurie <dlaurie@google.com> Original-Commit-Id: 87666b349e039b94eb3d0a77c1262424beff2bf4 Original-Change-Id: Id6552f7213a52ed8c0f083a8388719a8fe79fa77 Original-Signed-off-by: Shelley Chen <shchen@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/457841 Original-Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/524227
-rw-r--r--firmware/lib/vboot_ui_menu.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index 77f27468..1ef4b8ae 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -740,6 +740,8 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
if (current_menu_idx > 0)
current_menu_idx--;
vb2_draw_current_screen(ctx, cparams);
+ /* reset 30 second timer */
+ audio = VbAudioOpen(cparams);
break;
case VB_BUTTON_VOL_DOWN:
case VB_KEY_DOWN:
@@ -749,6 +751,8 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
if (current_menu_idx < menu_size-1)
current_menu_idx++;
vb2_draw_current_screen(ctx, cparams);
+ /* reset 30 second timer */
+ audio = VbAudioOpen(cparams);
break;
case VB_BUTTON_POWER:
case '\r':
@@ -851,6 +855,8 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
VbExSleepMs(5000);
return VBERROR_REBOOT_REQUIRED;
}
+ /* reset 30 second timer */
+ audio = VbAudioOpen(cparams);
break;
default:
VB2_DEBUG("pressed key %d\n", key);