summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShelley Chen <shchen@chromium.org>2017-06-20 13:49:34 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-06-22 17:03:50 -0700
commit05418ff02ce0869e13105a4d33545169abeaa2ec (patch)
tree9a54a437bf4a73fe4681438b8993da9260b7de5f
parent01dc8189247394893bbe163fa6b4897a3593bf9c (diff)
downloadvboot-05418ff02ce0869e13105a4d33545169abeaa2ec.tar.gz
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>
-rw-r--r--firmware/lib/vboot_display.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index abf2d698..f3cb4d6e 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -607,8 +607,13 @@ VbError_t VbDisplayDebugInfo(struct vb2_context *ctx, VbCommonParams *cparams)
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));