summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-07-25 21:09:39 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-07-25 21:09:39 +0200
commit62be2695703f7721172b91f5a7a1a7f3528027eb (patch)
tree9f71fa193053a0476a4d9b4c86b36ef2247862d6
parentMerge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 (diff)
parentMerge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 (diff)
downloadandroid_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.tar
android_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.tar.gz
android_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.tar.bz2
android_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.tar.lz
android_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.tar.xz
android_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.tar.zst
android_bootable_recovery-62be2695703f7721172b91f5a7a1a7f3528027eb.zip
-rw-r--r--recovery.cpp17
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) {