commit 93237251d5891bb62dd27f00b115a52425ff3d2c
author Paul Lawrence <paullawrence@google.com> Mon Jul 13 18:04:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 13 18:04:40 2015 +0000
tree 8ba8311c23dba0fa9fc0bae2edb3daf0dfe8ff18
parent 10f78c56798f0aa7d6209ecc6a9e3a273c1dd038
parent f733ae6306b1a6226492015e7f475a17df32f681

am f733ae63: Don\'t break on setting default password

* commit 'f733ae6306b1a6226492015e7f475a17df32f681':
  Don't break on setting default password

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index a905ff6..1a63a5b 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -3237,7 +3237,9 @@
 int cryptfs_changepw(int crypt_type, const char *newpw)
 {
     if (e4crypt_crypto_complete(DATA_MNT_POINT) == 0) {
-        return e4crypt_change_password(DATA_MNT_POINT, crypt_type, newpw);
+        return e4crypt_change_password(DATA_MNT_POINT, crypt_type,
+                    crypt_type == CRYPT_TYPE_DEFAULT ? DEFAULT_PASSWORD
+                                                     : newpw);
     }
 
     struct crypt_mnt_ftr crypt_ftr;