| commit | cb86a33750ca3a71bb8c0de1ec8f69d25d5c65d1 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Apr 19 17:17:07 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 19 17:17:07 2018 +0000 |
| tree | 5d05644bbe6186d71974deb7bd8ebba4f352691a | |
| parent | 76401da72e426678729696e89080846f98ff4e3e [diff] | |
| parent | 33da9dbfaaf47c4e3e63e05a6c62242778f4fd15 [diff] |
Merge "Set property for metadata encryption on first boot" into pi-dev
diff --git a/init/builtins.cpp b/init/builtins.cpp index acbeca2..8bd92cc 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp
@@ -519,6 +519,7 @@ 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