Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "incfs: tolerate either ptrdiff_t or size_t for std::span" am: f93b1f9698 am: 405237f24d am: 7dd0f616ab am: 09c6bfecd0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202603

Change-Id: I9f3bf450be5a1742debe32709ea7141c6bffbbcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ryan Prichard
2022-09-02 22:06:03 +00:00
committed by Automerger Merge Worker
parent 1b39510a02 09c6bfecd0
commit ed9022cd21
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/incremental/BinderIncrementalService.cpp
View File

@@ -216,7 +216,10 @@ static std::span<const uint8_t> toSpan(const ::std::optional<::std::vector<uint8
if (!content) { if (!content) {
return {}; 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( binder::Status BinderIncrementalService::makeFile(

6
services/incremental/IncrementalService.cpp
View File

@@ -1166,11 +1166,11 @@ int IncrementalService::makeFile(StorageId storage, std::string_view path, int m
if (!ifs) { if (!ifs) {
return -EINVAL; return -EINVAL;
} }
if (data.size() > params.size) { if ((IncFsSize)data.size() > params.size) {
LOG(ERROR) << "Bad data size - bigger than file size"; LOG(ERROR) << "Bad data size - bigger than file size";
return -EINVAL; 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 // 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. // data later. Check that the last written page is complete, or we may break the file.
if (!isPageAligned(data.size())) { if (!isPageAligned(data.size())) {
@@ -3188,7 +3188,7 @@ binder::Status IncrementalService::IncrementalServiceConnector::setStorageParams
} }
FileId IncrementalService::idFromMetadata(std::span<const uint8_t> metadata) { 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 } // namespace android::incremental