commit dfe3d869a5b70fc8a4fe41c4736d3fdb0d8fe5f1
author David Ng <dave@codeaurora.org> Fri Oct 02 09:00:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 02 09:00:31 2015 +0000
tree 487435d61cbed9382c34f4571e5c162ae605eec1
parent aa5ffaeef28f3c9de7f6ed3a5d21aeca4562eadc
parent 44710f0f9c868f999aecb91a8d3cd8bf9536b283

am 44710f0f: am 82fd804f: vold: Retry opening block device on failure when starting encryption

* commit '44710f0f9c868f999aecb91a8d3cd8bf9536b283':
  vold: Retry opening block device on failure when starting encryption

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index a9a8031..3a87741 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -44,8 +44,6 @@
 #include "Process.h"
 #include "Loop.h"
 #include "Devmapper.h"
-#include "Ext4Crypt.h"
-#include "cryptfs.h"
 #include "MoveTask.h"
 #include "TrimTask.h"
 

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
old mode 100755
new mode 100644

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index b947822..87b131e 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -43,7 +43,7 @@
 status_t Check(const std::string& source) {
     std::vector<std::string> cmd;
     cmd.push_back(kFsckPath);
-    cmd.push_back("-f");
+    cmd.push_back("-a");
     cmd.push_back(source);
 
     // f2fs devices are currently always trusted