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

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

Merge "Use metadata_key_dir instead of metadata_encryption" am: 389e5c11 

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

Change-Id: Ieb7f82d0f3531975ca06d88894610d4ead9dc52c
parents 744885a2 389e5c11

recovery_utils/roots.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;