diff options
author | Doug Zongker <dougz@android.com> | 2009-06-17 22:07:13 -0700 |
---|---|---|
committer | Doug Zongker <dougz@android.com> | 2009-06-17 22:07:13 -0700 |
commit | d683785ec9d36a9f4c7de1983f69a1f049132365 (patch) | |
tree | 23ad6c933463bd0506ce492b7fba92dc7006ae48 /recovery.c | |
parent | e77e091522122bed0b4f75a3abcb120e398c9abe (diff) | |
parent | fb2e3af3f915c0e3f2b4b027ef26777267ad46dc (diff) | |
download | bootable_recovery-d683785ec9d36a9f4c7de1983f69a1f049132365.zip bootable_recovery-d683785ec9d36a9f4c7de1983f69a1f049132365.tar.gz bootable_recovery-d683785ec9d36a9f4c7de1983f69a1f049132365.tar.bz2 |
resolved conflicts for merge of fb2e3af3 to master
Diffstat (limited to 'recovery.c')
-rw-r--r-- | recovery.c | 22 |
1 files changed, 20 insertions, 2 deletions
@@ -288,7 +288,25 @@ erase_root(const char *root) static void prompt_and_wait() { - ui_start_menu(MENU_HEADERS, MENU_ITEMS); + char* title[] = { "Android system recovery <" + EXPAND(RECOVERY_API_VERSION) ">", + "", + NULL }; + + // count the number of lines in our title, plus the + // product-provided headers. + int count = 0; + char** p; + for (p = title; *p; ++p, ++count); + for (p = MENU_HEADERS; *p; ++p, ++count); + + char** headers = malloc((count+1) * sizeof(char*)); + char** h = headers; + for (p = title; *p; ++p, ++h) *h = *p; + for (p = MENU_HEADERS; *p; ++p, ++h) *h = *p; + *h = NULL; + + ui_start_menu(headers, MENU_ITEMS); int selected = 0; int chosen_item = -1; @@ -370,7 +388,7 @@ prompt_and_wait() // if we didn't return from this function to reboot, show // the menu again. - ui_start_menu(MENU_HEADERS, MENU_ITEMS); + ui_start_menu(headers, MENU_ITEMS); selected = 0; chosen_item = -1; |