am 62224a32: (-s ours) am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE
* commit '62224a32f00c344c8ba6edab2107c833700e26a8':
Only cleanup ASECs in external storage DO NOT MERGE
diff --git a/cryptfs.c b/cryptfs.c
index e1c177d..cebe625 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1365,12 +1365,12 @@
} else {
char value[PROPERTY_VALUE_MAX];
- property_get("ro.vold.wipe_on_cyrypt_fail", value, "0");
+ property_get("ro.vold.wipe_on_crypt_fail", value, "0");
if (!strcmp(value, "1")) {
/* wipe data if encryption failed */
SLOGE("encryption failed - rebooting into recovery to wipe data\n");
mkdir("/cache/recovery", 0700);
- int fd = open("/cache/recovery/command", O_RDWR|O_CREAT|O_TRUNC);
+ int fd = open("/cache/recovery/command", O_RDWR|O_CREAT|O_TRUNC, 0600);
if (fd >= 0) {
write(fd, "--wipe_data", strlen("--wipe_data") + 1);
close(fd);