commit c79fb89a10ea9bc3b0f1f9c7caa809a705989479
author Jeff Sharkey <jsharkey@android.com> Thu Nov 12 20:18:02 2015 -0800
committer Jeff Sharkey <jsharkey@android.com> Thu Nov 19 11:16:22 2015 -0700
tree 5480ed2dd389e65244df5fc3684d90750e20eb5b
parent c74ce36359dac7b4990d0eb31a3dc430b86578eb

Switch to new FBE emulation property.

Also prepare CE/DE storage directories for owner user at boot.

Bug: 22358539
Change-Id: I76228952c990ebed83360c69ef36321b99114196

main.cpp

diff --git a/main.cpp b/main.cpp
index 648f36a..537e0a0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,6 +18,7 @@
 #include "VolumeManager.h"
 #include "CommandListener.h"
 #include "CryptCommandListener.h"
+#include "Ext4Crypt.h"
 #include "NetlinkManager.h"
 #include "cryptfs.h"
 #include "sehandle.h"
@@ -96,6 +97,9 @@
         vm->setDebug(true);
     }
 
+    // Prepare owner storage
+    e4crypt_prepare_user_storage(nullptr, 0);
+
     cl = new CommandListener();
     ccl = new CryptCommandListener();
     vm->setBroadcaster((SocketListener *) cl);