commit df9252faf742d092150f2fb4b0d28942ba5f5181
author Tao Bao <tbao@google.com> Tue Jul 25 19:05:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 19:05:09 2017 +0000
tree e47578c259e482da854cbd1f4b38a82adce70806
parent 9c62f6786322ced9137c82bf8fa5e5288da236b5
parent a40c15717d83df4ccaa1a8b44995ad05ce82a395

Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33
am: a40c15717d

Change-Id: I2b6120ab9c2defddbb5a7a72ee6269c005a12b4b

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 11c12f6..8f08c53 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1591,15 +1591,14 @@
             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) {