Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33
am: a40c15717d
Change-Id: I2b6120ab9c2defddbb5a7a72ee6269c005a12b4b
This commit is contained in:
+8
-9
@@ -1591,15 +1591,14 @@ int main(int argc, char **argv) {
|
|||||||
ui->Print("Rebooting automatically.\n");
|
ui->Print("Rebooting automatically.\n");
|
||||||
}
|
}
|
||||||
} else if (!just_exit) {
|
} else if (!just_exit) {
|
||||||
status = INSTALL_NONE; // No command specified
|
// If this is an eng or userdebug build, automatically turn on the text display if no command
|
||||||
ui->SetBackground(RecoveryUI::NO_COMMAND);
|
// is specified. Note that this should be called before setting the background to avoid
|
||||||
|
// flickering the background image.
|
||||||
// http://b/17489952
|
if (is_ro_debuggable()) {
|
||||||
// If this is an eng or userdebug build, automatically turn on the
|
ui->ShowText(true);
|
||||||
// text display if no command is specified.
|
}
|
||||||
if (is_ro_debuggable()) {
|
status = INSTALL_NONE; // No command specified
|
||||||
ui->ShowText(true);
|
ui->SetBackground(RecoveryUI::NO_COMMAND);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) {
|
if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) {
|
||||||
|
|||||||
Reference in New Issue
Block a user