commit c222ad20eefe2b8332d921d77f3b5c61715ee9dd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 19 20:27:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 19 20:27:44 2019 +0000
tree 530b92851fc1b55a3f344144c211ed8682c0322e
parent 419528be57a37930e662b2acdfebef52f491fec5
parent 7e38a3a3c82fd0e824e6fbfb96d4aa4e12e52592

Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set"

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 400a616..dc3a26c 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -2253,6 +2253,7 @@
          * /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;
         }