platform: msm_shared: Fix display doesn't show expected screen
Add below verified boot display changes:
1. "g.co/ABH" is colorized based on the VB state
(ie.,ORANGE, YELLOW etc).
2. "g.co/placeholder" is removed.
Change-Id: I9f6ebb2d9b23e22cc5e82ab9ad827a7b69236cc2
diff --git a/platform/msm_shared/display_menu.c b/platform/msm_shared/display_menu.c
index 8ee11ff..4942567 100644
--- a/platform/msm_shared/display_menu.c
+++ b/platform/msm_shared/display_menu.c
@@ -56,19 +56,21 @@
"or No. Then press the Power button to continue.\n";
#define YELLOW_WARNING_MSG "Your device has loaded a different operating system\n\n "\
- "Visit this link on another device:\n g.co/ABH"
+ "Visit this link on another device:\n"
#define ORANGE_WARNING_MSG "Your device software can't be\n checked for corruption. Please lock the bootloader\n\n"\
- "Visit this link on another device:\n g.co/ABH"
+ "Visit this link on another device:\n"
#define RED_WARNING_MSG "Your device is corrupt. It can't be\ntrusted and will not boot\n\n" \
- "Visit this link on another device:\n g.co/ABH"
+ "Visit this link on another device:\n"
#define LOGGING_WARNING_MSG "The dm-verity is not started in enforcing mode and may "\
"not work properly\n\nTo learn more, visit:\n"
#define EIO_WARNING_MSG "Your device is corrupt. It can't be\n trusted and may not work properly.\n\n"\
- "Visit this link on another device:\n g.co/ABH"
+ "Visit this link on another device:\n"
+
+#define URL_MSG "g.co/ABH\n"
#define DELAY_5SEC 5000
#define DELAY_30SEC 30000
@@ -80,14 +82,15 @@
struct boot_verify_info {
int msg_type;
const char *warning_msg;
+ const char *url_msg;
};
struct boot_verify_info boot_verify_info[] = {
- [DISPLAY_MENU_RED] = {FBCON_RED_MSG, RED_WARNING_MSG},
- [DISPLAY_MENU_YELLOW] = {FBCON_YELLOW_MSG, YELLOW_WARNING_MSG},
- [DISPLAY_MENU_ORANGE] = {FBCON_ORANGE_MSG, ORANGE_WARNING_MSG},
- [DISPLAY_MENU_LOGGING] = {FBCON_RED_MSG, LOGGING_WARNING_MSG},
- [DISPLAY_MENU_EIO] = {FBCON_RED_MSG, EIO_WARNING_MSG}};
+ [DISPLAY_MENU_RED] = {FBCON_RED_MSG, RED_WARNING_MSG, URL_MSG},
+ [DISPLAY_MENU_YELLOW] = {FBCON_YELLOW_MSG, YELLOW_WARNING_MSG, URL_MSG},
+ [DISPLAY_MENU_ORANGE] = {FBCON_ORANGE_MSG, ORANGE_WARNING_MSG, URL_MSG},
+ [DISPLAY_MENU_LOGGING] = {FBCON_RED_MSG, LOGGING_WARNING_MSG, NULL},
+ [DISPLAY_MENU_EIO] = {FBCON_RED_MSG, EIO_WARNING_MSG, URL_MSG}};
#endif
static char *verify_option_menu[] = {
@@ -286,8 +289,9 @@
display_fbcon_menu_message((char*)boot_verify_info[type].warning_msg,
FBCON_COMMON_MSG, common_factor);
- display_fbcon_menu_message("g.co/placeholder\n",
- boot_verify_info[type].msg_type, common_factor);
+ if(boot_verify_info[type].url_msg != NULL)
+ display_fbcon_menu_message((char*)boot_verify_info[type].url_msg,
+ boot_verify_info[type].msg_type, common_factor);
if (type == DISPLAY_MENU_YELLOW) {
fp_buf = get_boot_fingerprint(&fp_size);