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

Commit c6491551 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Warn the user when cancelling in-progress updates." into main am: bfaec270 

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



Change-Id: Ibd4a5c240f5209b5523d59ffbdf58718059a2772
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e0e6f3e bfaec270

install/include/install/snapshot_utils.h

+3 −0
Original line number Diff line number Diff line
@@ -28,3 +28,6 @@ bool FinishPendingSnapshotMerges(Device* device); 
 * devices were created or there was no need to.

 */

bool CreateSnapshotPartitions();



// Check whether it's okay to cancel any in-progress OTAs for sideload.

bool IsCancelUpdateSafe(Device* device);

install/snapshot_utils.cpp

+11 −0
Original line number Diff line number Diff line
@@ -23,9 +23,20 @@ 
#include "recovery_ui/ui.h"

#include "recovery_utils/roots.h"



using android::snapshot::CancelResult;

using android::snapshot::CreateResult;

using android::snapshot::SnapshotManager;



bool IsCancelUpdateSafe(Device* device) {

  auto sm = SnapshotManager::New();

  if (!sm) {

    RecoveryUI* ui = device->GetUI();

    ui->Print("Could not create SnapshotManager.\n");

    return false;

  }

  return sm->IsCancelUpdateSafe();

}



bool FinishPendingSnapshotMerges(Device* device) {

  if (!android::base::GetBoolProperty("ro.virtual_ab.enabled", false)) {

    return true;

recovery.cpp

+25 −0
Original line number Diff line number Diff line
@@ -175,6 +175,25 @@ static bool ask_to_wipe_data(Device* device) { 
  return (chosen_item == 1);

}



static bool ask_to_cancel_ota(Device* device) {

  // clang-format off

  std::vector<std::string> headers{

    "Overwrite in-progress update?",

    "An update may already be in progress. If you proceed, "

    "the existing OS may not longer boot, and completing "

    "an update via ADB will be required."

  };

  std::vector<std::string> items{

    "Cancel",

    "Continue",

  };

  // clang-format on

  size_t chosen_item = device->GetUI()->ShowMenu(

      headers, items, 0, true,

      std::bind(&Device::HandleMenuKey, device, std::placeholders::_1, std::placeholders::_2));

  return (chosen_item == 1);

}



static InstallResult prompt_and_wipe_data(Device* device) {

  // Reset to normal system boot so recovery won't cycle indefinitely.

  std::string err;
@@ -461,6 +480,12 @@ static Device::BuiltinAction PromptAndWait(Device* device, InstallResult status) 
      case Device::ENTER_RESCUE: {

        save_current_log = true;



        if (!IsCancelUpdateSafe(device)) {

          if (!ask_to_cancel_ota(device)) {

            break;

          }

        }



        update_in_progress = true;

        WriteUpdateInProgress();