commit 79cbdb262e28c0c2200ad84192639858141c2e0d
author Tao Bao <tbao@google.com> Tue Jul 25 19:12:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 19:12:40 2017 +0000
tree 9f71fa193053a0476a4d9b4c86b36ef2247862d6
parent 32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112
parent 62be2695703f7721172b91f5a7a1a7f3528027eb

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

Change-Id: I75bbd4830db86ff06694d970e6a4ca4912707401

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) {