diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-02 23:58:35 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-02 23:58:35 +0100 |
| commit | 4e6e027086a7970d8a0a8e67c55e79865fdbfc83 (patch) | |
| tree | 0e62039fe3bda6098332134f4eeba58cbaa19f75 | |
| parent | Merge "Avoid to format raw disk if metadata encryption is enabled" am: 5bd36e04be (diff) | |
| parent | Merge "Use metadata_key_dir instead of metadata_encryption" (diff) | |
| download | android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.tar android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.tar.gz android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.tar.bz2 android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.tar.lz android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.tar.xz android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.tar.zst android_bootable_recovery-4e6e027086a7970d8a0a8e67c55e79865fdbfc83.zip | |
| -rw-r--r-- | recovery_utils/roots.cpp | 2 |
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; |