commit 60aafe382d896007374fc2da7e6e0d755454fa4e
author Paul Crowley <paulcrowley@google.com> Tue Jul 14 15:50:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 14 15:50:04 2015 +0000
tree a97d3627a4a769373775845528fc402a014abe65
parent 722afdd0f611ccbabbeda8259e48cc10a0798751
parent 95b5c3dedcec60ea8d31c192592e0cfdc26af730

am 95b5c3de: am e76d9e6b: Fix erroneous comment in secdiscard.cpp, plus style fixes.

* commit '95b5c3dedcec60ea8d31c192592e0cfdc26af730':
  Fix erroneous comment in secdiscard.cpp, plus style fixes.

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"
 

CryptCommandListener.cpp

diff --git a/CryptCommandListener.cpp b/CryptCommandListener.cpp
index 173be63..68db073 100644
--- a/CryptCommandListener.cpp
+++ b/CryptCommandListener.cpp
@@ -289,15 +289,6 @@
         dumpArgs(argc, argv, -1);
         cryptfs_clear_password();
         rc = 0;
-    } else if (!strcmp(argv[1], "setusercryptopolicies")) {
-        if (argc != 3) {
-            cli->sendMsg(ResponseCode::CommandSyntaxError,
-                "Usage: cryptfs setusercryptopolicies <path>", false);
-            return 0;
-        }
-        SLOGD("cryptfs setusercryptopolicies");
-        dumpArgs(argc, argv, -1);
-        rc = e4crypt_set_user_crypto_policies(argv[2]);
     } else if (!strcmp(argv[1], "createnewuserdir")) {
         if (argc != 4) {
             cli->sendMsg(ResponseCode::CommandSyntaxError,

VolumeManager.cpp

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