Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56

Change-Id: I198643b4e0f8849f51d7c3565a4050549759b06e
This commit is contained in:
Paul Crowley 2020-05-19 23:33:25 +00:00 committed by Automerger Merge Worker
commit 6d944bcc8b

View file

@ -337,6 +337,11 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
LOG(DEBUG) << "Mounting metadata-encrypted filesystem:" << mount_point;
mount_via_fs_mgr(mount_point.c_str(), crypto_blkdev.c_str());
// Record that there's at least one fstab entry with metadata encryption
if (!android::base::SetProperty("ro.crypto.metadata.enabled", "true")) {
LOG(WARNING) << "failed to set ro.crypto.metadata.enabled"; // This isn't fatal
}
return true;
}