diff options
author | Koushik Dutta <koushd@gmail.com> | 2012-07-18 00:37:15 -0700 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2012-07-18 00:38:01 -0700 |
commit | b54fd836784bbb3d3778036c358ae7f5f76cf8ed (patch) | |
tree | 6a4ca8c03290887a9564aa26840018a6cf5ac09e | |
parent | 0cecef78299079dac739a1fb38ecd73f8464971b (diff) | |
download | bootable_recovery-b54fd836784bbb3d3778036c358ae7f5f76cf8ed.zip bootable_recovery-b54fd836784bbb3d3778036c358ae7f5f76cf8ed.tar.gz bootable_recovery-b54fd836784bbb3d3778036c358ae7f5f76cf8ed.tar.bz2 |
fix build for devices using ui_menu_level
Change-Id: I0ed813bb11edff5ce2cd8516d824b5599b5b2554
Conflicts:
Android.mk
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | recovery.c | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -34,7 +34,7 @@ else RECOVERY_NAME := CWM-based Recovery endif -RECOVERY_VERSION := $(RECOVERY_NAME) v6.0.0.4 +RECOVERY_VERSION := $(RECOVERY_NAME) v6.0.0.7 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 @@ -690,6 +690,7 @@ wipe_data(int confirm) { ui_print("Data wipe complete.\n"); } +int ui_menu_level = 1; int ui_root_menu = 0; static void prompt_and_wait() { @@ -700,8 +701,11 @@ prompt_and_wait() { ui_reset_progress(); ui_root_menu = 1; + // ui_menu_level is a legacy variable that i am keeping around to prevent build breakage. + ui_menu_level = 0; // allow_display_toggle = 1; int chosen_item = get_menu_selection(headers, MENU_ITEMS, 0, 0); + ui_menu_level = 1; ui_root_menu = 0; // allow_display_toggle = 0; |