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

Commit f8d48e18 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c33 

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



Change-Id: I6bb9892a11e5d9d8fb5ef46d6788d4ca0c9d768d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42f35dbb 0d4e8c33

install/include/install/wipe_data.h

+1 −1
Original line number Diff line number Diff line
@@ -27,4 +27,4 @@ struct selabel_handle; 
bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm);



// Returns true on success.

bool WipeData(Device* device);
 
bool WipeData(Device* device, bool keep_memtag_mode = false);

install/wipe_data.cpp

+10 −6
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm_func) { 
  return success;

}



bool WipeData(Device* device) {

bool WipeData(Device* device, bool keep_memtag_mode) {

  RecoveryUI* ui = device->GetUI();

  ui->Print("\n-- Wiping data...\n");

  ui->SetBackground(RecoveryUI::ERASING);
@@ -101,12 +101,16 @@ bool WipeData(Device* device) { 
      success &= EraseVolume(METADATA_ROOT, ui);

    }

  }

  if (keep_memtag_mode) {

    ui->Print("NOT resetting memtag message as per request...\n");

  } else {

    ui->Print("Resetting memtag message...\n");

    std::string err;

    if (!WriteMiscMemtagMessage({}, &err)) {

      ui->Print("Failed to reset memtag message: %s\n", err.c_str());

      success = false;

    }

  }

  if (success) {

    success &= device->PostWipeData();

  }

recovery.cpp

+5 −1
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri 
    { "wipe_ab", no_argument, nullptr, 0 },

    { "wipe_cache", no_argument, nullptr, 0 },

    { "wipe_data", no_argument, nullptr, 0 },

    { "keep_memtag_mode", no_argument, nullptr, 0 },

    { "wipe_package_size", required_argument, nullptr, 0 },

    { nullptr, 0, nullptr, 0 },

  };
@@ -616,6 +617,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri 
  bool install_with_fuse = false;  // memory map the update package by default.

  bool should_wipe_data = false;

  bool should_prompt_and_wipe_data = false;

  bool should_keep_memtag_mode = false;

  bool should_wipe_cache = false;

  bool should_wipe_ab = false;

  size_t wipe_package_size = 0;
@@ -675,6 +677,8 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri 
          should_wipe_data = true;

        } else if (option == "wipe_package_size") {

          android::base::ParseUint(optarg, &wipe_package_size);

        } else if (option == "keep_memtag_mode") {

          should_keep_memtag_mode = true;

        }

        break;

      }
@@ -793,7 +797,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri 
  } else if (should_wipe_data) {

    save_current_log = true;

    CHECK(device->GetReason().has_value());

    if (!WipeData(device)) {

    if (!WipeData(device, should_keep_memtag_mode)) {

      status = INSTALL_ERROR;

    }

  } else if (should_prompt_and_wipe_data) {