tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Expose new IncFS interface through Vold am: d05bcc8070 am: 636da65360

Browse source 
Change-Id: I349002a3eb80d962c86b24f89816c4ce76d5d65e
This commit is contained in:
Yurii Zubrytskyi 2020-03-26 07:59:44 +00:00 committed by Automerger Merge Worker
commit b52e063350
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
VoldNativeService.cpp
View file

@ -927,26 +927,26 @@ binder::Status VoldNativeService::resetCheckpoint() {
return ok();
}
binder::Status VoldNativeService::incFsVersion(int32_t* _aidl_return) {
*_aidl_return = IncFs_Version();
binder::Status VoldNativeService::incFsEnabled(bool* _aidl_return) {
*_aidl_return = IncFs_IsEnabled();
return ok();
}
binder::Status VoldNativeService::mountIncFs(
const std::string& imagePath, const std::string& targetDir, int32_t flags,
const std::string& backingPath, const std::string& targetDir, int32_t flags,
::android::os::incremental::IncrementalFileSystemControlParcel* _aidl_return) {
auto result = IncFs_Mount(imagePath.c_str(), targetDir.c_str(), flags,
INCFS_DEFAULT_READ_TIMEOUT_MS, 0777);
if (result.cmdFd < 0) {
return translate(result.cmdFd);
auto result = IncFs_Mount(backingPath.c_str(), targetDir.c_str(),
{.flags = IncFsMountFlags(flags),
.defaultReadTimeoutMs = INCFS_DEFAULT_READ_TIMEOUT_MS,
.readLogBufferPages = 4});
if (result.cmd < 0) {
return translate(result.cmd);
}
LOG(INFO) << "VoldNativeService::mountIncFs: everything is fine! " << result.cmdFd << "/"
<< result.logFd;
using ParcelFileDescriptor = ::android::os::ParcelFileDescriptor;
using unique_fd = ::android::base::unique_fd;
_aidl_return->cmd = ParcelFileDescriptor(unique_fd(result.cmdFd));
if (result.logFd >= 0) {
_aidl_return->log = ParcelFileDescriptor(unique_fd(result.logFd));
_aidl_return->cmd.emplace(unique_fd(result.cmd));
_aidl_return->pendingReads.emplace(unique_fd(result.pendingReads));
if (result.logs >= 0) {
_aidl_return->log.emplace(unique_fd(result.logs));
}
return ok();
}

4
VoldNativeService.h
View file

@ -144,9 +144,9 @@ class VoldNativeService : public BinderService<VoldNativeService>, public os::Bn
binder::Status supportsFileCheckpoint(bool* _aidl_return);
binder::Status resetCheckpoint();
binder::Status incFsVersion(int32_t* _aidl_return) override;
binder::Status incFsEnabled(bool* _aidl_return) override;
binder::Status mountIncFs(
const std::string& imagePath, const std::string& targetDir, int32_t flags,
const std::string& backingPath, const std::string& targetDir, int32_t flags,
::android::os::incremental::IncrementalFileSystemControlParcel* _aidl_return) override;
binder::Status unmountIncFs(const std::string& dir) override;
binder::Status bindMount(const std::string& sourceDir, const std::string& targetDir) override;

4
binder/android/os/IVold.aidl
View file

@ -128,8 +128,8 @@ interface IVold {
FileDescriptor openAppFuseFile(int uid, int mountId, int fileId, int flags);
int incFsVersion();
IncrementalFileSystemControlParcel mountIncFs(@utf8InCpp String imagePath, @utf8InCpp String targetDir, int flags);
boolean incFsEnabled();
IncrementalFileSystemControlParcel mountIncFs(@utf8InCpp String backingPath, @utf8InCpp String targetDir, int flags);
void unmountIncFs(@utf8InCpp String dir);
void bindMount(@utf8InCpp String sourceDir, @utf8InCpp String targetDir);