Merge "fs_mgr: fix userdebug/user argument type mismatch" am: 1d0ee36de7 (9e913d50) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_overlayfs.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -57,11 +57,11 @@ using namespace android::fs_mgr;

	#if ALLOW_ADBD_DISABLE_VERITY == 0 // If we are a user build, provide stubs		#if ALLOW_ADBD_DISABLE_VERITY == 0 // If we are a user build, provide stubs

	bool fs_mgr_overlayfs_mount_all(const fstab*) {		bool fs_mgr_overlayfs_mount_all(fstab*) {
	return false;		return false;
	}		}

	std::vector<std::string> fs_mgr_overlayfs_required_devices(const fstab*) {		std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab*) {
	return {};		return {};
	}		}