commit 21568ad78eb2601d9f7bdcf745e19fe57d969d21
author Paul Crowley <paulcrowley@google.com> Wed Apr 18 17:28:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 18 17:28:35 2018 -0700
tree 676ce27c31fec998da242dda5bcd9142a62ee266
parent 1e3d6a96d0d247764257855c92a8c7650a22c9cc
parent 502c1d70de84415b947f85929381db663a784595

Merge "Set property for metadata encryption on first boot"
am: def249956c

Change-Id: I233286b4275d82be930683ca86147273f3b8c5dd

init/builtins.cpp

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