commit 7331a963d566b8dc11959ede833101cc636be7f3
author Paul Crowley <paulcrowley@google.com> Tue Jul 14 15:50:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 14 15:50:05 2015 +0000
tree 51c7615892e45d769f01ab5399463aab952dd144
parent 60aafe382d896007374fc2da7e6e0d755454fa4e
parent c93442eea4b74858b0b45c69f0642d05bce7e8e8

am c93442ee: am 93363482: Evict the key before we delete it.

* commit 'c93442eea4b74858b0b45c69f0642d05bce7e8e8':
  Evict the key before we delete it.

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