recovery: Don't print mount errors when checking for encryption (0c3b2bd1) · Commits · e / os / android_bootable_recovery

recovery_main.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ static std::string load_locale_from_cache() {
		}

		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 @@ static void copy_userdata_files() {
		}
		ensure_path_unmounted("/data");
		}
		android::base::SetLogger(UiLogger);
		}

		// Sets the usb config to 'state'.

+4 −1

Original line number	Diff line number	Diff line
		@@ -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 @@ status_t EmulatedVolume::doMount() {

		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) {