Snap for 12185670 from 4a022ed3335dbabf24a3d7cd672ca444cb312531 to 24Q4-release (3519edf2) · Commits · e / os / android_system_core

fs_mgr/fs_mgr.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -216,10 +216,6 @@ static void check_fs(const std::string& blk_device, const std::string& fs_type,
		*/
		if (!(*fs_stat & FS_STAT_FULL_MOUNT_FAILED)) { // already tried if full mount failed
		errno = 0;
		if (fs_type == "ext4") {
		// This option is only valid with ext4
		tmpmnt_opts += ",nomblk_io_submit";
		}
		ret = mount(blk_device.c_str(), target.c_str(), fs_type.c_str(), tmpmnt_flags,
		tmpmnt_opts.c_str());
		PINFO << __FUNCTION__ << "(): mount(" << blk_device << "," << target << "," << fs_type

+5 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,11 @@ bool FirstStageMountVBootV2::InitDevices() {
		return false;
		}
		}

		if (IsArcvm() && !block_dev_init_.InitHvcDevice("hvc1")) {
		return false;
		}

		return true;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,8 @@ void SelinuxRestoreContext() {
		RestoreconIfExists(SnapshotManager::GetGlobalRollbackIndicatorPath().c_str(), 0);
		RestoreconIfExists("/metadata/gsi",
		SELINUX_ANDROID_RESTORECON_RECURSE \| SELINUX_ANDROID_RESTORECON_SKIP_SEHASH);

		RestoreconIfExists("/dev/hvc1", 0);
		}

		int SelinuxKlogCallback(int type, const char* fmt, ...) {

+5 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@

		#include <sys/stat.h>
		#include <sys/types.h>
		#include <sys/unistd.h>

		#include <chrono>
		#include <functional>
		@@ -108,6 +109,10 @@ inline constexpr bool IsMicrodroid() {
		#endif
		}

		inline bool IsArcvm() {
		return !access("/is_arcvm", F_OK);
		}

		bool Has32BitAbi();

		std::string GetApexNameFromFileName(const std::string& path);