From 09a8f76ac23c358642a256308cd68a6d4bc23b72 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Thu, 27 Jun 2019 15:01:55 -0700 Subject: Implement ShowMenu for StubRecoveryUI The ShowMenu in StubRecoveryUI used to return initial selection immediately. This leads to an immediate reboot if we enter recovery with a stub UI and wait for user's input. This cl changes the behavior of stub UI's ShowMenu so that it waits keys in loop, and only returns in the case of interruption or time out. Bug: 130535924 Test: start recovery with a stub UI, wait for the timeout Change-Id: I96ad8aad8930756b09101bb98ba5fbe7b53bcb37 --- recovery_ui/include/recovery_ui/stub_ui.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'recovery_ui/include') diff --git a/recovery_ui/include/recovery_ui/stub_ui.h b/recovery_ui/include/recovery_ui/stub_ui.h index fb1d8c7a6..511b1314a 100644 --- a/recovery_ui/include/recovery_ui/stub_ui.h +++ b/recovery_ui/include/recovery_ui/stub_ui.h @@ -62,11 +62,9 @@ class StubRecoveryUI : public RecoveryUI { // menu display size_t ShowMenu(const std::vector& /* headers */, - const std::vector& /* items */, size_t initial_selection, + const std::vector& /* items */, size_t /* initial_selection */, bool /* menu_only */, - const std::function& /* key_handler */) override { - return initial_selection; - } + const std::function& /* key_handler */) override; size_t ShowPromptWipeDataMenu(const std::vector& /* backup_headers */, const std::vector& /* backup_items */, -- cgit v1.2.3