Merge "Set property for metadata encryption on first boot"

am: def249956c

Change-Id: I233286b4275d82be930683ca86147273f3b8c5dd
This commit is contained in:
Paul Crowley 2018-04-18 17:28:35 -07:00 committed by android-build-merger
commit 533870c48f

View file

@ -519,6 +519,7 @@ static Result<Success> queue_fs_event(int code) {
if (e4crypt_install_keyring()) {
return Error() << "e4crypt_install_keyring() failed";
}
property_set("ro.crypto.state", "encrypted");
property_set("ro.crypto.type", "file");
// Although encrypted, vold has already set the device up, so we do not need to