diff options
| author | Ben Fennema <fennema@google.com> | 2023-11-09 03:11:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 03:11:43 +0000 |
| commit | 3d8bcba75390a8f0b8218de7a2abf6dbac97942d (patch) | |
| tree | 24a923f482dba666519942e4663bf7d5183b8e13 | |
| parent | 0abd6e6dbc0685b2636f2dbd22ac8304b9ecabff (diff) | |
| parent | 6dcb48b30dbf55c72d63d6d352cb0b97eab53241 (diff) | |
| download | recovery-3d8bcba75390a8f0b8218de7a2abf6dbac97942d.tar.gz | |
Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7 am: 6dcb48b30d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470
Change-Id: Ia58739cb52944348003ebe8553190c7922277eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | fastboot/fastboot.cpp | 1 | ||||
| -rw-r--r-- | recovery_main.cpp | 2 | ||||
| -rw-r--r-- | recovery_ui/wear_ui.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 7806248c..42f985e4 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -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); } diff --git a/recovery_main.cpp b/recovery_main.cpp index 9a358aba..1c2b4073 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -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) { diff --git a/recovery_ui/wear_ui.cpp b/recovery_ui/wear_ui.cpp index 309891cd..7b9ecf8e 100644 --- a/recovery_ui/wear_ui.cpp +++ b/recovery_ui/wear_ui.cpp @@ -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. |