commit 58ec71b9d41d3b7d9195b07e6368d3753aacf7be
author Paul Lawrence <paullawrence@google.com> Fri Mar 11 01:53:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 11 01:53:43 2016 +0000
tree 912654030a0007a6059eba621ec9d0abc579e854
parent 53b9484734cdb3b8bfb24b59cf51ef8eb98be9fc
parent dba928fabdd25b2834d6178c99a1c9557f89fa7c

Merge "Make sure encryption type is set on first boot" into nyc-dev am: 439034b8cc
am: dba928fabd

* commit 'dba928fabdd25b2834d6178c99a1c9557f89fa7c':
  Make sure encryption type is set on first boot

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 84e4118..de56a6b 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -3236,6 +3236,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