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

Commit 2022d655 authored by LuK1337's avatar LuK1337 Committed by Bruno Martins
Browse files

recovery: Clear BCB before rebooting to recovery 

This should clear update_in_progress flag.

Change-Id: Idc5b99a77d6f1368fa37cf664a1fb5b6b19886db
parent a16da114

install/install.cpp

+10 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <android-base/strings.h>

#include <android-base/unique_fd.h>



#include "bootloader_message/bootloader_message.h"

#include "install/snapshot_utils.h"

#include "install/spl_check.h"

#include "install/wipe_data.h"
@@ -418,10 +419,17 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, 
    return INSTALL_ERROR;

  }



  const auto reboot_to_recovery = [] {

    if (std::string err; !clear_bootloader_message(&err)) {

      LOG(ERROR) << "Failed to clear BCB message: " << err;

    }

    Reboot("userrequested,recovery,ui");

  };



  static bool ab_package_installed = false;

  if (ab_package_installed) {

    if (ask_to_ab_reboot(device)) {

      Reboot("userrequested,recovery,ui");

      reboot_to_recovery();

    }

    return INSTALL_ERROR;

  }
@@ -614,7 +622,7 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, 
    ab_package_installed = true;

    PerformPowerwashIfRequired(zip, device);

    if (ask_to_ab_reboot(device)) {

      Reboot("userrequested,recovery,ui");

      reboot_to_recovery();

    }

  }