From 4ed4526e68b10c9d583541da9dadaf3d29b769cd Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Thu, 10 Mar 2016 15:44:21 -0800
Subject: [PATCH] Make sure encryption type is set on first boot

Bug: 27599622
Change-Id: I2f38c03941ac8cdba40baf7421132f572866e296
---
 cryptfs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cryptfs.c b/cryptfs.c
index fcc9724..918a48a 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -3231,6 +3231,7 @@ int cryptfs_enable_internal(char *howarg, int crypt_type, char *passwd,
           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