summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@google.com>2021-12-02 21:51:20 +0100
committerJaegeuk Kim <jaegeuk@google.com>2021-12-02 21:57:39 +0100
commitfa9516530079654092d9645ba6e8fee714292f78 (patch)
tree0e62039fe3bda6098332134f4eeba58cbaa19f75
parentMerge "Avoid to format raw disk if metadata encryption is enabled" (diff)
downloadandroid_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.tar
android_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.tar.gz
android_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.tar.bz2
android_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.tar.lz
android_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.tar.xz
android_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.tar.zst
android_bootable_recovery-fa9516530079654092d9645ba6e8fee714292f78.zip
-rw-r--r--recovery_utils/roots.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index d761e7525..7fe385b5e 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -182,7 +182,7 @@ int format_volume(const std::string& volume, const std::string& directory) {
// 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_encryption.empty() && length == 0) {
+ 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;