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

Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev

Browse source
This commit is contained in:
Alex Buynytskyy 2020-04-02 00:36:26 +00:00 committed by Android (Google) Code Review
commit 6ce90ced12
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
VoldNativeService.cpp
View file

@ -53,6 +53,7 @@ namespace vold {
namespace {
constexpr const char* kDump = "android.permission.DUMP";
constexpr const char* kDataUsageStats = "android.permission.LOADER_USAGE_STATS";
static binder::Status error(const std::string& msg) {
PLOG(ERROR) << msg;
@ -893,7 +894,8 @@ binder::Status VoldNativeService::mountIncFs(
auto control = IncFs_Mount(backingPath.c_str(), targetDir.c_str(),
{.flags = IncFsMountFlags(flags),
.defaultReadTimeoutMs = INCFS_DEFAULT_READ_TIMEOUT_MS,
.readLogBufferPages = 4});
// Mount with read logs disabled.
.readLogBufferPages = 0});
if (control == nullptr) {
return translate(-1);
}
@ -915,6 +917,28 @@ binder::Status VoldNativeService::unmountIncFs(const std::string& dir) {
return translate(IncFs_Unmount(dir.c_str()));
}
binder::Status VoldNativeService::setIncFsMountOptions(
const ::android::os::incremental::IncrementalFileSystemControlParcel& control,
bool enableReadLogs) {
auto status = CheckPermission(kDataUsageStats);
if (!status.isOk()) {
return status;
}
auto incfsControl = IncFs_CreateControl(dup(control.cmd.get()), dup(control.pendingReads.get()),
dup(control.log.get()));
if (auto error = IncFs_SetOptions(
incfsControl,
{.defaultReadTimeoutMs = INCFS_DEFAULT_READ_TIMEOUT_MS,
.readLogBufferPages = enableReadLogs ? INCFS_DEFAULT_PAGE_READ_BUFFER_PAGES : 0});
error < 0) {
status = binder::Status::fromServiceSpecificError(error);
}
IncFs_DeleteControl(incfsControl);
return status;
}
binder::Status VoldNativeService::bindMount(const std::string& sourceDir,
const std::string& targetDir) {
ENFORCE_SYSTEM_OR_ROOT;

3
VoldNativeService.h
View file

@ -154,6 +154,9 @@ class VoldNativeService : public BinderService<VoldNativeService>, public os::Bn
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 setIncFsMountOptions(
const ::android::os::incremental::IncrementalFileSystemControlParcel& control,
bool enableReadLogs) override;
binder::Status bindMount(const std::string& sourceDir, const std::string& targetDir) override;
};

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

@ -135,6 +135,7 @@ interface IVold {
boolean incFsEnabled();
IncrementalFileSystemControlParcel mountIncFs(@utf8InCpp String backingPath, @utf8InCpp String targetDir, int flags);
void unmountIncFs(@utf8InCpp String dir);
void setIncFsMountOptions(in IncrementalFileSystemControlParcel control, boolean enableReadLogs);
void bindMount(@utf8InCpp String sourceDir, @utf8InCpp String targetDir);
const int ENCRYPTION_FLAG_NO_UI = 4;