Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706

am: 18de138abd

Change-Id: Ic584d1b5a8fb8cb29b439472d6ec945a582a7d46
This commit is contained in:
Tao Bao
2019-06-27 15:57:52 -07:00
committed by android-build-merger

View File

@@ -1263,7 +1263,7 @@ size_t ScreenRecoveryUI::ShowMenu(const std::vector<std::string>& headers,
return initial_selection;
}
return ShowMenu(CreateMenu(headers, items, initial_selection), menu_only, key_handler);
return ShowMenu(std::move(menu), menu_only, key_handler);
}
size_t ScreenRecoveryUI::ShowPromptWipeDataMenu(const std::vector<std::string>& backup_headers,