Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9

am: 25bf90201c

Change-Id: Ie7451d7ed8acb7118655ca90ed1bd738447eef0d
This commit is contained in:
Paul Crowley
2017-03-23 23:44:42 +00:00
committed by android-build-merger
+6 -4
View File
@@ -752,13 +752,15 @@ static bool wipe_data(Device* device) {
static bool prompt_and_wipe_data(Device* device) {
const char* const headers[] = {
"Boot halted, user data is corrupt",
"Wipe all user data to recover",
"Can't load Android system. Your data may be corrupt.",
"If you continue to get this message, you may need to",
"perform a factory data reset and erase all user data",
"stored on this device.",
NULL
};
const char* const items[] = {
"Retry boot",
"Wipe user data",
"Try again",
"Factory data reset",
NULL
};
for (;;) {