commit a921b6795ea3566de95e8167f16b3780c986ef4b
author xzj <xzj@rock-chips.com> Fri Apr 19 14:15:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 19 14:15:15 2019 -0700
tree 530b92851fc1b55a3f344144c211ed8682c0322e
parent 9389f389f5731ccac99109b4ec2a6e3c3ac3702c
parent c222ad20eefe2b8332d921d77f3b5c61715ee9dd

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

Change-Id: I5ebb8825b40c3ce088607f8a4aa6d4fb506f6bd5

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;
         }