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

Merge "Move to new Fstab class"

Browse source 
am: 12e20e3f2a

Change-Id: I09be93fbbade4a7ef01c4bf0ea4c202da3ec2f7b
This commit is contained in:
Tom Cherry 2019-01-31 11:50:32 -08:00 committed by android-build-merger
commit 3184a39837
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
health/storage/1.0/default/Storage.cpp
View file

@ -36,29 +36,22 @@ using base::Timer;
using base::Trim;
using base::WriteStringToFd;
using base::WriteStringToFile;
using fs_mgr::Fstab;
using fs_mgr::ReadDefaultFstab;
std::string getGarbageCollectPath() {
std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),
fs_mgr_free_fstab);
struct fstab_rec* rec = NULL;
Fstab fstab;
ReadDefaultFstab(&fstab);
for (int i = 0; i < fstab->num_entries; i++) {
if (fs_mgr_has_sysfs_path(&fstab->recs[i])) {
rec = &fstab->recs[i];
break;
for (const auto& entry : fstab) {
if (!entry.sysfs_path.empty()) {
return entry.sysfs_path + "/manual_gc";
}
}
if (!rec) {
return "";
}
std::string path;
path.append(rec->sysfs_path);
path = path + "/manual_gc";
return path;
}
Return<void> Storage::garbageCollect(uint64_t timeoutSeconds,
const sp<IGarbageCollectCallback>& cb) {
Result result = Result::SUCCESS;