Allow non datamedia devices to wipe encryption
With 5.0 L, we decrypt automatically if the default_password is
used. Non datamedia devices do not get the format data button so
they cannot wipe encryption off the device. This patch add a wipe
encryption button where the format data button would normally be
located on the Wipe page.
This patch also attempts to remove / delete the dm-crypt block
device before formatting.
Change-Id: I100d5d154d6c49254fd48e23279df973db5f23ae
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c
index c6586cc..496b960 100644
--- a/crypto/lollipop/cryptfs.c
+++ b/crypto/lollipop/cryptfs.c
@@ -725,7 +725,7 @@
return retval;
}
-static int delete_crypto_blk_dev(char *name)
+int delete_crypto_blk_dev(char *name)
{
int fd;
char buffer[DM_CRYPT_BUF_SIZE];
diff --git a/crypto/lollipop/cryptfs.h b/crypto/lollipop/cryptfs.h
index 8cb8a7a..bc8b463 100644
--- a/crypto/lollipop/cryptfs.h
+++ b/crypto/lollipop/cryptfs.h
@@ -213,6 +213,7 @@
int cryptfs_check_passwd(char *pw);
int cryptfs_verify_passwd(char *newpw);
int cryptfs_get_password_type(void);
+ int delete_crypto_blk_dev(char *name);
#ifdef __cplusplus
}
#endif