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

Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7 am: 6dcb48b30d am: 3d8bcba753

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470

Change-Id: Ie7810958ac48ad62262649f3898b8225ed4b33b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ben Fennema 2023-11-09 03:57:34 +00:00 committed by Automerger Merge Worker
commit 236665f7cd
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()) {
FillWearableFastbootLines(title_lines);
} else {
ui->SetEnableFastbootdLogo(true);
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);
if (ret == Device::KEY_INTERRUPTED) {

1
recovery_ui/wear_ui.cpp
View file

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