summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Crowley <paulcrowley@google.com>2018-04-19 17:17:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-19 17:17:07 +0000
commit2df20b6271a7ca478ff835a9785032c75f83685c (patch)
tree5d05644bbe6186d71974deb7bd8ebba4f352691a
parentdc29476d7e029e6c477c133b71ca55d52ee95744 (diff)
parent5872cbdf02ee0a64f1a313f00eb1e635b452393b (diff)
Merge "Set property for metadata encryption on first boot" into pi-dev
-rw-r--r--init/builtins.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index acbeca233..8bd92ccdd 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -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