Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4022a1de authored by Ben Fennema's avatar Ben Fennema
Browse files

Fix removal of fastbootd logo for wear 



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

Bug: 309820589
Change-Id: I01a97026812cd9960a71d95ea30b46e5ba5c9675
Signed-off-by: default avatarBen Fennema <fennema@google.com>
parent 0d4e8c33

fastboot/fastboot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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);

  }

recovery_main.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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) {

recovery_ui/wear_ui.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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.