tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix removal of fastbootd logo for wear

Browse source 
Move SetEnableFastbootdLogo() into StartFastboot() for !IsWearable().

Bug: 309820589
Change-Id: I01a97026812cd9960a71d95ea30b46e5ba5c9675
Signed-off-by: Ben Fennema <fennema@google.com>
This commit is contained in:
Ben Fennema 2023-11-07 16:04:58 -08:00
parent 0d4e8c333c
commit 4022a1deb8
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fastboot/fastboot.cpp
View file

@ -70,6 +70,7 @@ Device::BuiltinAction StartFastboot(Device* device, const std::vector<std::strin
if (ui->IsWearable()) { if (ui->IsWearable()) {
FillWearableFastbootLines(title_lines); FillWearableFastbootLines(title_lines);
} else { } else {
ui->SetEnableFastbootdLogo(true);
FillDefaultFastbootLines(title_lines); FillDefaultFastbootLines(title_lines);
} }

2
recovery_main.cpp
View file

@ -485,8 +485,6 @@ int main(int argc, char** argv) {
} }
} }
ui->SetEnableFastbootdLogo(fastboot);
auto ret = fastboot ? StartFastboot(device, args) : start_recovery(device, args); auto ret = fastboot ? StartFastboot(device, args) : start_recovery(device, args);
if (ret == Device::KEY_INTERRUPTED) { if (ret == Device::KEY_INTERRUPTED) {

1
recovery_ui/wear_ui.cpp
View file

@ -42,7 +42,6 @@ WearRecoveryUI::WearRecoveryUI()
kDefaultIsScreenCircle)) { kDefaultIsScreenCircle)) {
// TODO: menu_unusable_rows_ should be computed based on the lines in draw_screen_locked(). // TODO: menu_unusable_rows_ should be computed based on the lines in draw_screen_locked().
touch_screen_allowed_ = true; touch_screen_allowed_ = true;
SetEnableFastbootdLogo(false); // logo not required on Wear
} }
// Draw background frame on the screen. Does not flip pages. // Draw background frame on the screen. Does not flip pages.