commit 82fb0faa0f12ee8f970a31d74b5f71ffdf83977b
author Alessandro <ales.astone@gmail.com> Mon Apr 06 23:55:07 2020 +0200
committer Michael Bestas <mkbestas@lineageos.org> Mon Aug 29 23:07:49 2022 +0300
tree c72baaf249d94fd2f4fd70a7e04117f387d7fc17
parent 0057c5f93dca57607e2793386de2729b1a9cb947

recovery: Don't print mount errors when checking for encryption

Change-Id: Ibd57b8bdb9c942edb16fa5b9e4664ed66864b180

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index b15719e..4c8eb40 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -198,6 +198,7 @@
 }
 
 static void copy_userdata_files() {
+  android::base::SetLogger(android::base::StdioLogger);
   if (ensure_path_mounted("/data") == 0) {
     if (access(adb_keys_root, F_OK) != 0) {
       if (access(adb_keys_data, R_OK) == 0) {
@@ -209,6 +210,7 @@
     }
     ensure_path_unmounted("/data");
   }
+  android::base::SetLogger(UiLogger);
 }
 
 // Sets the usb config to 'state'.

volume_manager/EmulatedVolume.cpp

diff --git a/volume_manager/EmulatedVolume.cpp b/volume_manager/EmulatedVolume.cpp
index d0e0dcf..88eb7d9 100644
--- a/volume_manager/EmulatedVolume.cpp
+++ b/volume_manager/EmulatedVolume.cpp
@@ -25,6 +25,7 @@
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 
+#include <iostream>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/mount.h>
@@ -70,7 +71,9 @@
 
     if (::mount(mDevPath.c_str(), kStagingPath.c_str(), mFsType.c_str(), mFlags,
                 mFsOptions.c_str()) != 0) {
-        PLOG(ERROR) << getId() << " failed to mount " << mDevPath << " on " << kStagingPath;
+        // It's ok to fail mounting if we're encrytped, so avoid printing to recovery's UiLogger
+        std::cout << getId() << " failed to mount " << mDevPath << " on " << kStagingPath
+                  << ": " << std::strerror(errno);
         return -EIO;
     }
     if (BindMount(bindPath, getPath()) != OK) {