commit 2b845a5b329dbb5290dba52afe68d3ccdb4559a7
author xzj <xzj@rock-chips.com> Fri Apr 19 18:40:13 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 19 18:40:13 2019 -0700
tree cabfc28a0a565e858da33dd4ef1d399fb985af45
parent a8d425a9272c15a6d8a1204f157169e5c00f5212
parent 3348c6e915adeebb569838371e84ee663f420a7a

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

Change-Id: I3f83c061342202ae4ae19e42738f66d11c5cbfac

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