diff options
| author | Tao Bao <tbao@google.com> | 2017-08-16 07:07:55 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-16 07:07:55 +0200 |
| commit | 623bac4ed95f4feb6166de7abfed0b43240834b8 (patch) | |
| tree | 3a95c5b7ab72d865be55609019f315d26b29766a /recovery.cpp | |
| parent | Merge "Add a new PatchChunk class in imgdiff" (diff) | |
| parent | Merge "screen_ui: Word-wrap menu headers." (diff) | |
| download | android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.tar android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.tar.gz android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.tar.bz2 android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.tar.lz android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.tar.xz android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.tar.zst android_bootable_recovery-623bac4ed95f4feb6166de7abfed0b43240834b8.zip | |
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 9 |
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", |