Merge "libincfs and libdataloader headers not using std::span" into rvc-dev... (966a5786) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_pm_PackageManagerShellCommandDataLoader.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ private:
		}

		// Installation.
		bool onPrepareImage(const dataloader::DataLoaderInstallationFiles& addedFiles) final {
		bool onPrepareImage(dataloader::DataLoaderInstallationFiles addedFiles) final {
		JNIEnv* env = GetOrAttachJNIEnvironment(mJvm);
		const auto& jni = jniIds(env);

		@@ -510,7 +510,7 @@ private:
		consumed += remain;
		}

		auto res = mIfs->writeBlocks({blocks->data(), blocks->data() + blocks->size()});
		auto res = mIfs->writeBlocks({blocks->data(), blocks->size()});

		blocks->clear();
		buffer->erase(buffer->begin(), buffer->begin() + consumed);
		@@ -530,7 +530,7 @@ private:
		uint32_t count;
		};

		void onPageReads(const android::dataloader::PageReads& pageReads) final {
		void onPageReads(android::dataloader::PageReads pageReads) final {
		auto trace = atrace_is_tag_enabled(ATRACE_TAG);
		if (CC_LIKELY(!trace)) {
		return;
		@@ -600,7 +600,7 @@ private:
		}

		// IFS callbacks.
		void onPendingReads(const dataloader::PendingReads& pendingReads) final {
		void onPendingReads(dataloader::PendingReads pendingReads) final {
		CHECK(mIfs);
		for (auto&& pendingRead : pendingReads) {
		const android::dataloader::FileId& fileId = pendingRead.id;

services/incremental/IncrementalService.h

+6 −4

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <limits>
		#include <map>
		#include <mutex>
		#include <span>
		#include <string>
		#include <string_view>
		#include <unordered_map>
		@@ -96,8 +97,7 @@ public:

		std::optional<std::future<void>> onSystemReady();

		StorageId createStorage(std::string_view mountPoint,
		DataLoaderParamsParcel&& dataLoaderParams,
		StorageId createStorage(std::string_view mountPoint, DataLoaderParamsParcel&& dataLoaderParams,
		const DataLoaderStatusListener& dataLoaderStatusListener,
		CreateOptions options = CreateOptions::Default);
		StorageId createLinkedStorage(std::string_view mountPoint, StorageId linkedStorage,
		@@ -133,7 +133,8 @@ public:
		std::string_view libDirRelativePath, std::string_view abi);
		class IncrementalDataLoaderListener : public android::content::pm::BnDataLoaderStatusListener {
		public:
		IncrementalDataLoaderListener(IncrementalService& incrementalService, DataLoaderStatusListener externalListener)
		IncrementalDataLoaderListener(IncrementalService& incrementalService,
		DataLoaderStatusListener externalListener)
		: incrementalService(incrementalService), externalListener(externalListener) {}
		// Callbacks interface
		binder::Status onStatusChanged(MountId mount, int newStatus) override;
		@@ -206,7 +207,8 @@ private:
		std::string&& source, std::string&& target, BindKind kind,
		std::unique_lock<std::mutex>& mainLock);

		bool prepareDataLoader(IncFsMount& ifs, DataLoaderParamsParcel* params = nullptr, const DataLoaderStatusListener* externalListener = nullptr);
		bool prepareDataLoader(IncFsMount& ifs, DataLoaderParamsParcel* params = nullptr,
		const DataLoaderStatusListener* externalListener = nullptr);
		BindPathMap::const_iterator findStorageLocked(std::string_view path) const;
		StorageId findStorageId(std::string_view path) const;

services/incremental/ServiceWrappers.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public:
		virtual ErrorCode link(Control control, std::string_view from, std::string_view to) const = 0;
		virtual ErrorCode unlink(Control control, std::string_view path) const = 0;
		virtual base::unique_fd openWrite(Control control, FileId id) const = 0;
		virtual ErrorCode writeBlocks(std::span<const DataBlock> blocks) const = 0;
		virtual ErrorCode writeBlocks(Span<const DataBlock> blocks) const = 0;
		};

		class ServiceManagerWrapper {
		@@ -177,7 +177,7 @@ public:
		base::unique_fd openWrite(Control control, FileId id) const override {
		return base::unique_fd{incfs::openWrite(control, id)};
		}
		ErrorCode writeBlocks(std::span<const DataBlock> blocks) const override {
		ErrorCode writeBlocks(Span<const DataBlock> blocks) const override {
		return incfs::writeBlocks(blocks);
		}
		};

services/incremental/test/IncrementalServiceTest.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ public:
		ErrorCode(Control control, std::string_view from, std::string_view to));
		MOCK_CONST_METHOD2(unlink, ErrorCode(Control control, std::string_view path));
		MOCK_CONST_METHOD2(openWrite, base::unique_fd(Control control, FileId id));
		MOCK_CONST_METHOD1(writeBlocks, ErrorCode(std::span<const DataBlock> blocks));
		MOCK_CONST_METHOD1(writeBlocks, ErrorCode(Span<const DataBlock> blocks));

		void makeFileFails() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(-1)); }
		void makeFileSuccess() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(0)); }