Snap for 11281094 from 0aaa5af8aada1043e1e63d07c22a42836f1d5b0b to 24Q2-release
Change-Id: I09ab9cca58df2ddd2e43e2ce827f6dda526922c7
diff --git a/install/include/install/wipe_data.h b/install/include/install/wipe_data.h
index 255d9b1..1796bcc 100644
--- a/install/include/install/wipe_data.h
+++ b/install/include/install/wipe_data.h
@@ -24,7 +24,8 @@
struct selabel_handle;
// Returns true on success.
-bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm);
+bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm,
+ std::string_view new_fstype = "");
// Returns true on success.
-bool WipeData(Device* device, bool keep_memtag_mode = false);
+bool WipeData(Device* device, bool keep_memtag_mode = false, std::string_view new_fstype = "");
diff --git a/install/wipe_data.cpp b/install/wipe_data.cpp
index 7aff622..0f57384 100644
--- a/install/wipe_data.cpp
+++ b/install/wipe_data.cpp
@@ -27,7 +27,6 @@
#include "bootloader_message/bootloader_message.h"
#include "install/snapshot_utils.h"
-#include "otautil/dirutil.h"
#include "recovery_ui/ui.h"
#include "recovery_utils/logging.h"
#include "recovery_utils/roots.h"
@@ -36,7 +35,8 @@
constexpr const char* DATA_ROOT = "/data";
constexpr const char* METADATA_ROOT = "/metadata";
-static bool EraseVolume(const char* volume, RecoveryUI* ui) {
+static bool EraseVolume(const char* volume, RecoveryUI* ui, std::string_view new_fstype) {
+ LOG(INFO) << "Erasing volume " << volume << " with new filesystem type " << new_fstype;
bool is_cache = (strcmp(volume, CACHE_ROOT) == 0);
std::vector<saved_log_file> log_files;
@@ -50,7 +50,7 @@
ensure_path_unmounted(volume);
- int result = format_volume(volume);
+ int result = format_volume(volume, "", new_fstype);
if (is_cache) {
RestoreLogFilesAfterFormat(log_files);
@@ -59,7 +59,8 @@
return (result == 0);
}
-bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm_func) {
+bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm_func,
+ std::string_view new_fstype) {
bool has_cache = volume_for_mount_point("/cache") != nullptr;
if (!has_cache) {
ui->Print("No /cache partition found.\n");
@@ -74,14 +75,14 @@
ui->SetBackground(RecoveryUI::ERASING);
ui->SetProgressType(RecoveryUI::INDETERMINATE);
- bool success = EraseVolume("/cache", ui);
+ bool success = EraseVolume("/cache", ui, new_fstype);
ui->Print("Cache wipe %s.\n", success ? "complete" : "failed");
return success;
}
-bool WipeData(Device* device, bool keep_memtag_mode) {
+bool WipeData(Device* device, bool keep_memtag_mode, std::string_view data_fstype) {
RecoveryUI* ui = device->GetUI();
- ui->Print("\n-- Wiping data...\n");
+ ui->Print("\n-- Wiping data %.*s...\n", static_cast<int>(data_fstype.size()), data_fstype.data());
ui->SetBackground(RecoveryUI::ERASING);
ui->SetProgressType(RecoveryUI::INDETERMINATE);
@@ -92,13 +93,13 @@
bool success = device->PreWipeData();
if (success) {
- success &= EraseVolume(DATA_ROOT, ui);
+ success &= EraseVolume(DATA_ROOT, ui, data_fstype);
bool has_cache = volume_for_mount_point("/cache") != nullptr;
if (has_cache) {
- success &= EraseVolume(CACHE_ROOT, ui);
+ success &= EraseVolume(CACHE_ROOT, ui, data_fstype);
}
if (volume_for_mount_point(METADATA_ROOT) != nullptr) {
- success &= EraseVolume(METADATA_ROOT, ui);
+ success &= EraseVolume(METADATA_ROOT, ui, data_fstype);
}
}
if (keep_memtag_mode) {
diff --git a/recovery.cpp b/recovery.cpp
index 1a6a7d6..e7a33a9 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -16,11 +16,8 @@
#include "recovery.h"
-#include <ctype.h>
#include <errno.h>
#include <getopt.h>
-#include <inttypes.h>
-#include <limits.h>
#include <linux/input.h>
#include <stdio.h>
#include <stdlib.h>
@@ -51,7 +48,6 @@
#include "install/snapshot_utils.h"
#include "install/wipe_data.h"
#include "install/wipe_device.h"
-#include "otautil/boot_state.h"
#include "otautil/error_code.h"
#include "otautil/package.h"
#include "otautil/paths.h"
@@ -463,7 +459,7 @@
WriteUpdateInProgress();
bool adb = true;
- Device::BuiltinAction reboot_action;
+ Device::BuiltinAction reboot_action{};
if (chosen_action == Device::ENTER_RESCUE) {
// Switch to graphics screen.
ui->ShowText(false);
@@ -610,6 +606,7 @@
{ "wipe_data", no_argument, nullptr, 0 },
{ "keep_memtag_mode", no_argument, nullptr, 0 },
{ "wipe_package_size", required_argument, nullptr, 0 },
+ { "reformat_data", required_argument, nullptr, 0 },
{ nullptr, 0, nullptr, 0 },
};
@@ -632,8 +629,9 @@
auto args_to_parse = StringVectorToNullTerminatedArray(args);
- int arg;
- int option_index;
+ int arg = 0;
+ int option_index = 0;
+ std::string data_fstype;
// Parse everything before the last element (which must be a nullptr). getopt_long(3) expects a
// null-terminated char* array, but without counting null as an arg (i.e. argv[argc] should be
// nullptr).
@@ -677,6 +675,8 @@
should_wipe_data = true;
} else if (option == "wipe_package_size") {
android::base::ParseUint(optarg, &wipe_package_size);
+ } else if (option == "reformat_data") {
+ data_fstype = optarg;
} else if (option == "keep_memtag_mode") {
should_keep_memtag_mode = true;
}
@@ -698,7 +698,7 @@
// otherwise set it to "installing system update".
ui->SetSystemUpdateText(security_update);
- int st_cur, st_max;
+ int st_cur = 0, st_max = 0;
if (!device->GetStage().has_value() &&
sscanf(device->GetStage().value().c_str(), "%d/%d", &st_cur, &st_max) == 2) {
ui->SetStage(st_cur, st_max);
@@ -731,7 +731,7 @@
// to log the update attempt since update_package is non-NULL.
save_current_log = true;
- if (int required_battery_level; retry_count == 0 && !IsBatteryOk(&required_battery_level)) {
+ if (int required_battery_level = 0; retry_count == 0 && !IsBatteryOk(&required_battery_level)) {
ui->Print("battery capacity is not enough for installing package: %d%% needed\n",
required_battery_level);
// Log the error code to last_install when installation skips due to low battery.
@@ -797,7 +797,7 @@
} else if (should_wipe_data) {
save_current_log = true;
CHECK(device->GetReason().has_value());
- if (!WipeData(device, should_keep_memtag_mode)) {
+ if (!WipeData(device, should_keep_memtag_mode, data_fstype)) {
status = INSTALL_ERROR;
}
} else if (should_prompt_and_wipe_data) {
@@ -812,7 +812,7 @@
}
} else if (should_wipe_cache) {
save_current_log = true;
- if (!WipeCache(ui, nullptr)) {
+ if (!WipeCache(ui, nullptr, data_fstype)) {
status = INSTALL_ERROR;
}
} else if (should_wipe_ab) {
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 1c2b407..345d645 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -130,7 +130,7 @@
// Skip empty and '\0'-filled tokens.
if (!it->empty() && (*it)[0] != '\0') args.push_back(std::move(*it));
}
- LOG(INFO) << "Got " << args.size() << " arguments from boot message";
+ LOG(INFO) << "Got " << args.size() << " arguments from boot message " << android::base::Join(args, ", ");
} else if (boot.recovery[0] != 0) {
LOG(ERROR) << "Bad boot message: \"" << boot_recovery << "\"";
}
diff --git a/recovery_utils/include/recovery_utils/roots.h b/recovery_utils/include/recovery_utils/roots.h
index 92ee756..6afefb8 100644
--- a/recovery_utils/include/recovery_utils/roots.h
+++ b/recovery_utils/include/recovery_utils/roots.h
@@ -48,7 +48,8 @@
// "/cache"), no paths permitted. Attempts to unmount the volume if
// it is mounted.
// Copies 'directory' to root of the newly formatted volume
-int format_volume(const std::string& volume, const std::string& directory);
+int format_volume(const std::string& volume, const std::string& directory,
+ std::string_view new_fstype);
// Ensure that all and only the volumes that packages expect to find
// mounted (/tmp and /cache) are mounted. Returns 0 on success.
diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index 5c95cba..6396d44 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -130,7 +130,8 @@
return computed_size;
}
-int format_volume(const std::string& volume, const std::string& directory) {
+int format_volume(const std::string& volume, const std::string& directory,
+ std::string_view new_fstype) {
const FstabEntry* v = android::fs_mgr::GetEntryForPath(&fstab, volume);
if (v == nullptr) {
LOG(ERROR) << "unknown volume \"" << volume << "\"";
@@ -176,25 +177,11 @@
}
// If the raw disk will be used as a metadata encrypted device mapper target,
- // next boot will do encrypt_in_place the raw disk which gives a subtle duration
- // to get any failure in the process. In order to avoid it, let's simply wipe
- // the raw disk if we don't reserve any space, which behaves exactly same as booting
- // after "fastboot -w".
- if (!v->metadata_key_dir.empty() && length == 0) {
- android::base::unique_fd fd(open(v->blk_device.c_str(), O_RDWR));
- if (fd == -1) {
- PLOG(ERROR) << "format_volume: failed to open " << v->blk_device;
- return -1;
- }
- int64_t device_size = get_file_size(fd.get(), 0);
- if (device_size > 0 && !wipe_block_device(fd.get(), device_size)) {
- LOG(INFO) << "format_volume: wipe metadata encrypted " << v->blk_device << " with size "
- << device_size;
- return 0;
- }
- }
+ // next boot will first mount this partition as read only, and then unmount,
+ // call encrypt_inplace.
- if (v->fs_type == "ext4") {
+ if ((v->fs_type == "ext4" && new_fstype.empty()) || new_fstype == "ext4") {
+ LOG(INFO) << "Formatting " << v->blk_device << " as ext4";
static constexpr int kBlockSize = 4096;
std::vector<std::string> mke2fs_args = {
"/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
@@ -246,6 +233,7 @@
}
// Has to be f2fs because we checked earlier.
+ LOG(INFO) << "Formatting " << v->blk_device << " as f2fs";
static constexpr int kSectorSize = 4096;
std::vector<std::string> make_f2fs_cmd = {
"/system/bin/make_f2fs",
@@ -290,7 +278,7 @@
}
int format_volume(const std::string& volume) {
- return format_volume(volume, "");
+ return format_volume(volume, "", "");
}
int setup_install_mounts() {