summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-08-16 07:19:26 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-08-16 07:19:26 +0200
commit4e279cf5d7f859d63a840d58fd0a54b2874d80b9 (patch)
tree07a11cdcf6d620125a7b6a89d663426823d5d377 /recovery.cpp
parentMerge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acec am: bfd3123a6a (diff)
parentMerge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111 (diff)
downloadandroid_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.tar
android_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.tar.gz
android_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.tar.bz2
android_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.tar.lz
android_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.tar.xz
android_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.tar.zst
android_bootable_recovery-4e279cf5d7f859d63a840d58fd0a54b2874d80b9.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 9abb9341c..6f62ff17c 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -758,12 +758,13 @@ static bool wipe_data(Device* device) {
}
static bool prompt_and_wipe_data(Device* device) {
+ // Use a single string and let ScreenRecoveryUI handles the wrapping.
const char* const headers[] = {
- "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",
+ "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
+ nullptr
};
const char* const items[] = {
"Try again",