commit efec3f2927c45979db2b78e7a6228d08aafb5e42
author Paul Lawrence <paullawrence@google.com> Thu Apr 03 20:55:47 2014 +0000
committer Paul Lawrence <paullawrence@google.com> Thu Apr 03 20:55:47 2014 +0000
tree 4060cb5286bf74d1a1ceb09e7271287955a9da43
parent 5cc86c57416eccb70dcc949d68587f08726f96fa

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

cryptfs.h

diff --git a/cryptfs.h b/cryptfs.h
index c95d2c2..0e60d77 100644
--- a/cryptfs.h
+++ b/cryptfs.h
@@ -162,7 +162,7 @@
   int cryptfs_check_passwd(char *pw);
   int cryptfs_verify_passwd(char *newpw);
   int cryptfs_restart(void);
-  int cryptfs_enable(char *flag, int type, char *passwd, int allow_reboot);
+  int cryptfs_enable(char *flag, char *passwd, int allow_reboot);
   int cryptfs_changepw(int type, const char *newpw);
   int cryptfs_enable_default(char *flag, int allow_reboot);
   int cryptfs_setup_volume(const char *label, int major, int minor,