Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set" am: c222ad20ee am: a921b6795e

am: 3348c6e915 Change-Id: I3f83c061342202ae4ae19e42738f66d11c5cbfac
5 years ago · 2b845a5b32
parent a8d425a927 3348c6e915
commit 2b845a5b32
1 changed files with 1 additions and 0 deletions
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@ -2253,6 +2253,7 @@ int cryptfs_enable_internal(int crypt_type, const char* passwd, int no_ui) {
         * /data, set a property saying we're doing inplace encryption,
         * and restart the framework.
         */
+        wait_and_unmount(DATA_MNT_POINT, true);
        if (fs_mgr_do_tmpfs_mount(DATA_MNT_POINT)) {
            goto error_shutting_down;
        }