Merge "incfs: tolerate either ptrdiff_t or size_t for std::span" (f93b1f96) · Commits · e / os / android_frameworks_base

services/incremental/BinderIncrementalService.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,10 @@ static std::span<const uint8_t> toSpan(const ::std::optional<::std::vector<uint8
		if (!content) {
		return {};
		}
		return {content->data(), (int)content->size()};
		// TODO(b/175635923): Replace with {content->data(), content->size()} after libc++ is upgraded.
		// The type of the second std::span ctor param changed from ptrdiff_t to size_t between the old
		// libc++ and the finalized C++20.
		return std::span<const uint8_t>(content->data(), content->size());
		}

		binder::Status BinderIncrementalService::makeFile(

+3 −3

Original line number	Diff line number	Diff line
		@@ -1166,11 +1166,11 @@ int IncrementalService::makeFile(StorageId storage, std::string_view path, int m
		if (!ifs) {
		return -EINVAL;
		}
		if (data.size() > params.size) {
		if ((IncFsSize)data.size() > params.size) {
		LOG(ERROR) << "Bad data size - bigger than file size";
		return -EINVAL;
		}
		if (!data.empty() && data.size() != params.size) {
		if (!data.empty() && (IncFsSize)data.size() != params.size) {
		// Writing a page is an irreversible operation, and it can't be updated with additional
		// data later. Check that the last written page is complete, or we may break the file.
		if (!isPageAligned(data.size())) {
		@@ -3188,7 +3188,7 @@ binder::Status IncrementalService::IncrementalServiceConnector::setStorageParams
		}

		FileId IncrementalService::idFromMetadata(std::span<const uint8_t> metadata) {
		return IncFs_FileIdFromMetadata({(const char*)metadata.data(), metadata.size()});
		return IncFs_FileIdFromMetadata({(const char*)metadata.data(), (IncFsSize)metadata.size()});
		}

		} // namespace android::incremental