Revert "Encrypt phone even if pattern or no keyguard"
This reverts commit 5cc86c57416eccb70dcc949d68587f08726f96fa.
Without two more commits, this will break encryption. I'll re-commit when the other two pass code review.
Change-Id: I71720d065c16cf0f7f534e74ffe883f1e113c477
diff --git a/cryptfs.c b/cryptfs.c
index 40a473f..3d0f30b 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -2408,9 +2408,13 @@
return -1;
}
-int cryptfs_enable(char *howarg, int type, char *passwd, int allow_reboot)
+int cryptfs_enable(char *howarg, char *passwd, int allow_reboot)
{
- return cryptfs_enable_internal(howarg, type, passwd, allow_reboot);
+ /** @todo If we keep this route (user selected encryption)
+ * need to take a type in and pass it to here.
+ */
+ return cryptfs_enable_internal(howarg, CRYPT_TYPE_PASSWORD,
+ passwd, allow_reboot);
}
int cryptfs_enable_default(char *howarg, int allow_reboot)