Loading fs_mgr/libfiemap/image_manager.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -79,7 +79,7 @@ ImageManager::ImageManager(const std::string& metadata_dir, const std::string& d partition_opener_ = std::make_unique<android::fs_mgr::PartitionOpener>(); // Allow overriding whether ImageManager thinks it's in recovery, for testing. #ifdef __ANDROID_RECOVERY__ #ifdef __ANDROID_RAMDISK__ device_info_.is_recovery = {true}; #else if (!device_info_.is_recovery.has_value()) { Loading Loading @@ -523,7 +523,7 @@ bool ImageManager::MapImageDevice(const std::string& name, auto image_header = GetImageHeaderPath(name); #if !defined __ANDROID_RECOVERY__ #ifndef __ANDROID_RAMDISK__ // If there is a device-mapper node wrapping the block device, then we're // able to create another node around it; the dm layer does not carry the // exclusion lock down the stack when a mount occurs. Loading Loading
fs_mgr/libfiemap/image_manager.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -79,7 +79,7 @@ ImageManager::ImageManager(const std::string& metadata_dir, const std::string& d partition_opener_ = std::make_unique<android::fs_mgr::PartitionOpener>(); // Allow overriding whether ImageManager thinks it's in recovery, for testing. #ifdef __ANDROID_RECOVERY__ #ifdef __ANDROID_RAMDISK__ device_info_.is_recovery = {true}; #else if (!device_info_.is_recovery.has_value()) { Loading Loading @@ -523,7 +523,7 @@ bool ImageManager::MapImageDevice(const std::string& name, auto image_header = GetImageHeaderPath(name); #if !defined __ANDROID_RECOVERY__ #ifndef __ANDROID_RAMDISK__ // If there is a device-mapper node wrapping the block device, then we're // able to create another node around it; the dm layer does not carry the // exclusion lock down the stack when a mount occurs. Loading