summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-07-25 20:51:33 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-07-25 20:51:33 +0200
commit771dfb00169e78a8ded660fd93d0d7536a2548e9 (patch)
treee726cb4caf2f0bb19b0c77537c406e34a31d0bf8
parentMerge "otautil: Delete dirUnlinkHierarchy()." (diff)
parentrecovery: Fix the flickering when turning on text mode. (diff)
downloadandroid_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.tar
android_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.tar.gz
android_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.tar.bz2
android_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.tar.lz
android_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.tar.xz
android_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.tar.zst
android_bootable_recovery-771dfb00169e78a8ded660fd93d0d7536a2548e9.zip
-rw-r--r--recovery.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 55b12d5dd..8f3e9bdea 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1594,15 +1594,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) {