From 4022a1deb86d5b36d12a6c59d598a63eaaa20d09 Mon Sep 17 00:00:00 2001
From: Ben Fennema <fennema@google.com>
Date: Tue, 7 Nov 2023 16:04:58 -0800
Subject: [PATCH] Fix removal of fastbootd logo for wear

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

Bug: 309820589
Change-Id: I01a97026812cd9960a71d95ea30b46e5ba5c9675
Signed-off-by: Ben Fennema <fennema@google.com>
---
 fastboot/fastboot.cpp   | 1 +
 recovery_main.cpp       | 2 --
 recovery_ui/wear_ui.cpp | 1 -
 3 files changed, 1 insertion(+), 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.