aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-07-25 13:57:38 -0500
committerandroid-build-merger2017-07-25 13:57:38 -0500
commit276ff4cc33f80054b01961b6684e4790eb2bddf4 (patch)
treebe9ea045aff4ca3b2b2f954df58d6e76db773c4f /recovery.cpp
parent993cec5cc9ca780346d80625f9400d2e214f303a (diff)
parent771dfb00169e78a8ded660fd93d0d7536a2548e9 (diff)
downloadplatform-bootable-recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.gz
platform-bootable-recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.tar.xz
platform-bootable-recovery-276ff4cc33f80054b01961b6684e4790eb2bddf4.zip
Merge "recovery: Fix the flickering when turning on text mode."
am: 771dfb0016 Change-Id: Ic85356b782c6b83725d85f2104fb30fc81ad2ed1
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 11c12f6f..8f08c53f 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1591,15 +1591,14 @@ int main(int argc, char **argv) {
1591 ui->Print("Rebooting automatically.\n"); 1591 ui->Print("Rebooting automatically.\n");
1592 } 1592 }
1593 } else if (!just_exit) { 1593 } else if (!just_exit) {
1594 status = INSTALL_NONE; // No command specified 1594 // If this is an eng or userdebug build, automatically turn on the text display if no command
1595 ui->SetBackground(RecoveryUI::NO_COMMAND); 1595 // is specified. Note that this should be called before setting the background to avoid
1596 1596 // flickering the background image.
1597 // http://b/17489952 1597 if (is_ro_debuggable()) {
1598 // If this is an eng or userdebug build, automatically turn on the 1598 ui->ShowText(true);
1599 // text display if no command is specified. 1599 }
1600 if (is_ro_debuggable()) { 1600 status = INSTALL_NONE; // No command specified
1601 ui->ShowText(true); 1601 ui->SetBackground(RecoveryUI::NO_COMMAND);
1602 }
1603 } 1602 }
1604 1603
1605 if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) { 1604 if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) {