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

Merge "Enable metadata encryption for userdata_gsi." am: 99046b75c4 am: 8b90acafcd

Browse source 
am: 1f4307e51e

Change-Id: If3e65d967a99e3f757a1ab978067e61a3faeae66
This commit is contained in:
David Anderson 2019-02-14 12:50:52 -08:00 committed by android-build-merger
commit 42aabc24dc
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.cpp
View file

@ -226,7 +226,7 @@ static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quot
*has_adoptable = false; *has_adoptable = false;
*has_quota = false; *has_quota = false;
*has_reserved = false; *has_reserved = false;
for (const auto& entry : fstab_default) { for (auto& entry : fstab_default) {
if (entry.fs_mgr_flags.quota) { if (entry.fs_mgr_flags.quota) {
*has_quota = true; *has_quota = true;
} }
@ -234,6 +234,11 @@ static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quot
*has_reserved = true; *has_reserved = true;
} }
/* Make sure logical partitions have an updated blk_device. */
if (entry.fs_mgr_flags.logical && !fs_mgr_update_logical_partition(&entry)) {
PLOG(FATAL) << "could not find logical partition " << entry.blk_device;
}
if (entry.fs_mgr_flags.vold_managed) { if (entry.fs_mgr_flags.vold_managed) {
if (entry.fs_mgr_flags.nonremovable) { if (entry.fs_mgr_flags.nonremovable) {
LOG(WARNING) << "nonremovable no longer supported; ignoring volume"; LOG(WARNING) << "nonremovable no longer supported; ignoring volume";