diff options
| author | Tao Bao <tbao@google.com> | 2017-07-25 20:57:38 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-25 20:57:38 +0200 |
| commit | 276ff4cc33f80054b01961b6684e4790eb2bddf4 (patch) | |
| tree | be9ea045aff4ca3b2b2f954df58d6e76db773c4f /recovery.cpp | |
| parent | Merge "otautil: Delete dirUnlinkHierarchy()." (diff) | |
| parent | Merge "recovery: Fix the flickering when turning on text mode." (diff) | |
| download | android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.gz android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.bz2 android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.lz android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.xz android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.zst android_bootable_recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.zip | |
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/recovery.cpp b/recovery.cpp index 11c12f6f1..8f08c53f4 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1591,15 +1591,14 @@ int main(int argc, char **argv) { ui->Print("Rebooting automatically.\n"); } } else if (!just_exit) { - status = INSTALL_NONE; // No command specified - ui->SetBackground(RecoveryUI::NO_COMMAND); - - // http://b/17489952 - // If this is an eng or userdebug build, automatically turn on the - // text display if no command is specified. - if (is_ro_debuggable()) { - ui->ShowText(true); - } + // If this is an eng or userdebug build, automatically turn on the text display if no command + // is specified. Note that this should be called before setting the background to avoid + // flickering the background image. + if (is_ro_debuggable()) { + ui->ShowText(true); + } + status = INSTALL_NONE; // No command specified + ui->SetBackground(RecoveryUI::NO_COMMAND); } if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) { |