detachables: Highlight selection w/ Debug Info
Currently with detachable menu, when debug info is
displayed, the current selection is not highlighted.
Changing call in VbDisplayDebugInfo from
VbDisplaySecreen to VbDisplayMenu to ensure
selection is highlighted. This will have no effect
on firmware screens for non-detachables.
BUG=b:35585623
BRANCH=None
TEST=Compile with and without USE=detachable_ui
Reboot and display debug info. Make sure
that for detachable menu, selection remains
highlighted and for non-detachable screens,
The screen displays as usual.
Change-Id: I0a7a2c4e0ae3ffb82e13dc92a319288d4ccb3997
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/541758
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index abf2d69..f3cb4d6 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -607,8 +607,13 @@
VbError_t ret;
uint32_t i;
- /* Redisplay current screen to overwrite any previous debug output */
- VbDisplayScreen(ctx, cparams, disp_current_screen, 1);
+ /* Redisplay current screen to overwrite any previous debug output.
+ * Need to use VbDisplayMenu instead of VbDisplayScreen
+ * in order to ensure that the selected menu item is
+ * highlighted. On a non-detachable screen, this will be a
+ * no-op.
+ */
+ VbDisplayMenu(ctx, cparams, disp_current_screen, 1, disp_current_index);
/* Add hardware ID */
VbRegionReadHWID(cparams, hwid, sizeof(hwid));
