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

Commit 236665f7 authored by Ben Fennema's avatar Ben Fennema Committed by Automerger Merge Worker
Browse files

Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720b am:... 

Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720b am: 6dcb48b3 am: 3d8bcba7

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



Change-Id: Ie7810958ac48ad62262649f3898b8225ed4b33b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df90da14 3d8bcba7

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.