commit 4c7a8064d9a7ea65ed23ebcb375b73401b21805e
author Paul Crowley <paulcrowley@google.com> Wed Apr 18 17:32:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 18 17:32:09 2018 -0700
tree d3d7ea2ef7c4880076dc3cb5f54f2e85faf4bfd1
parent fa75844eee76c2913bf0c08dbf9abab4d8bf78fe
parent 21568ad78eb2601d9f7bdcf745e19fe57d969d21

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

Change-Id: Ia1e25e29fdb3196a8c6dafd41271c253bd24ce59

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