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
8 years ago · 58ec71b9d4
parent 53b9484734 dba928fabd
commit 58ec71b9d4
1 changed files with 1 additions and 0 deletions
--- a/cryptfs.c
+++ b/cryptfs.c
@ -3236,6 +3236,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