diff options
Diffstat (limited to 'cryptfs.cpp')
| -rw-r--r-- | cryptfs.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cryptfs.cpp b/cryptfs.cpp index 00e5519c..383bbe84 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp @@ -24,6 +24,7 @@ #include "cryptfs.h" +#include "Checkpoint.h" #include "EncryptInplace.h" #include "Ext4Crypt.h" #include "Keymaster.h" @@ -1562,7 +1563,9 @@ static int cryptfs_restart_internal(int restart_main) { SLOGE("Failed to setexeccon"); return -1; } - while ((mount_rc = fs_mgr_do_mount(fstab_default, DATA_MNT_POINT, crypto_blkdev, 0)) != 0) { + bool needs_cp = android::vold::cp_needsCheckpoint(); + while ((mount_rc = fs_mgr_do_mount(fstab_default, DATA_MNT_POINT, crypto_blkdev, 0, + needs_cp)) != 0) { if (mount_rc == FS_MGR_DOMNT_BUSY) { /* TODO: invoke something similar to Process::killProcessWithOpenFiles(DATA_MNT_POINT, |