commit 439034b8cc510a95d25c53c8606f88a40ddcbb0b
author Paul Lawrence <paullawrence@google.com> Fri Mar 11 01:42:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 11 01:42:55 2016 +0000
tree 5df9702566c4b44d10220c4507e61a3c8f76abf7
parent f84fe907141bcdb76425d5ba42913576f018a11c
parent 4ed4526e68b10c9d583541da9dadaf3d29b769cd

Merge "Make sure encryption type is set on first boot" into nyc-dev

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index fcc9724..918a48a 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -3231,6 +3231,7 @@
           if (!strcmp(value, "")) {
             /* default encryption - continue first boot sequence */
             property_set("ro.crypto.state", "encrypted");
+            property_set("ro.crypto.type", "block");
             release_wake_lock(lockid);
             if (rebootEncryption && crypt_ftr.crypt_type != CRYPT_TYPE_DEFAULT) {
                 // Bring up cryptkeeper that will check the password and set it