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

Merge "Use the new incfs API to open files" into rvc-dev

Browse Source
This commit is contained in:
Yurii Zubrytskyi
2020-04-01 23:10:05 +00:00
committed by Android (Google) Code Review
parent 40ee6ffa32 e82cdd7935
commit 52a010e956
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/jni/com_android_server_pm_PackageManagerShellCommandDataLoader.cpp
View File

@@ -438,7 +438,7 @@ private:
} }
const auto fileId = IncFs_FileIdFromMetadata(file.metadata); const auto fileId = IncFs_FileIdFromMetadata(file.metadata);
const auto incfsFd(mIfs->openWrite(fileId)); const base::unique_fd incfsFd(mIfs->openForSpecialOps(fileId).release());
if (incfsFd < 0) { if (incfsFd < 0) {
ALOGE("Failed to open an IncFS file for metadata: %.*s, final file name is: %s. " ALOGE("Failed to open an IncFS file for metadata: %.*s, final file name is: %s. "
"Error %d", "Error %d",
@@ -716,7 +716,7 @@ private:
auto& writeFd = writeFds[fileIdx]; auto& writeFd = writeFds[fileIdx];
if (writeFd < 0) { if (writeFd < 0) {
writeFd.reset(this->mIfs->openWrite(fileId)); writeFd.reset(this->mIfs->openForSpecialOps(fileId).release());
if (writeFd < 0) { if (writeFd < 0) {
ALOGE("Failed to open file %d for writing (%d). Aborting.", header.fileIdx, ALOGE("Failed to open file %d for writing (%d). Aborting.", header.fileIdx,
-writeFd); -writeFd);

4
services/incremental/IncrementalService.cpp
View File

@@ -1182,8 +1182,8 @@ bool IncrementalService::configureNativeBinaries(StorageId storage, std::string_
success = false; success = false;
break; break;
} }
android::base::unique_fd writeFd(mIncFs->openWrite(ifs->control, libFileId)); const auto writeFd = mIncFs->openForSpecialOps(ifs->control, libFileId);
if (writeFd < 0) { if (!writeFd.ok()) {
LOG(ERROR) << "Failed to open write fd for: " << targetLibPath << " errno: " << writeFd; LOG(ERROR) << "Failed to open write fd for: " << targetLibPath << " errno: " << writeFd;
success = false; success = false;
break; break;

6
services/incremental/ServiceWrappers.h
View File

@@ -76,7 +76,7 @@ public:
virtual ErrorCode link(const Control& control, std::string_view from, virtual ErrorCode link(const Control& control, std::string_view from,
std::string_view to) const = 0; std::string_view to) const = 0;
virtual ErrorCode unlink(const Control& control, std::string_view path) const = 0; virtual ErrorCode unlink(const Control& control, std::string_view path) const = 0;
virtual base::unique_fd openWrite(const Control& control, FileId id) const = 0; virtual base::unique_fd openForSpecialOps(const Control& control, FileId id) const = 0;
virtual ErrorCode writeBlocks(Span<const DataBlock> blocks) const = 0; virtual ErrorCode writeBlocks(Span<const DataBlock> blocks) const = 0;
}; };
@@ -177,8 +177,8 @@ public:
ErrorCode unlink(const Control& control, std::string_view path) const override { ErrorCode unlink(const Control& control, std::string_view path) const override {
return incfs::unlink(control, path); return incfs::unlink(control, path);
} }
base::unique_fd openWrite(const Control& control, FileId id) const override { base::unique_fd openForSpecialOps(const Control& control, FileId id) const override {
return base::unique_fd{incfs::openWrite(control, id)}; return base::unique_fd{incfs::openForSpecialOps(control, id).release()};
} }
ErrorCode writeBlocks(Span<const DataBlock> blocks) const override { ErrorCode writeBlocks(Span<const DataBlock> blocks) const override {
return incfs::writeBlocks(blocks); return incfs::writeBlocks(blocks);

2
services/incremental/test/IncrementalServiceTest.cpp
View File

@@ -175,7 +175,7 @@ public:
MOCK_CONST_METHOD3(link, MOCK_CONST_METHOD3(link,
ErrorCode(const Control& control, std::string_view from, std::string_view to)); ErrorCode(const Control& control, std::string_view from, std::string_view to));
MOCK_CONST_METHOD2(unlink, ErrorCode(const Control& control, std::string_view path)); MOCK_CONST_METHOD2(unlink, ErrorCode(const Control& control, std::string_view path));
MOCK_CONST_METHOD2(openWrite, base::unique_fd(const Control& control, FileId id)); MOCK_CONST_METHOD2(openForSpecialOps, base::unique_fd(const Control& control, FileId id));
MOCK_CONST_METHOD1(writeBlocks, ErrorCode(Span<const DataBlock> blocks)); MOCK_CONST_METHOD1(writeBlocks, ErrorCode(Span<const DataBlock> blocks));
void makeFileFails() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(-1)); } void makeFileFails() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(-1)); }