am 0f05445a: am b411bcc1: Move crypt commands to a different listener in vold

* commit '0f05445ac427a5fd5494c68e7d0d9125a02d619f':
  Move crypt commands to a different listener in vold

diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp
index 6564d74..7bcfc65 100644 (file)
--- a/ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/ext4_utils/ext4_crypt_init_extensions.cpp
@@ -163,3 +163,13 @@ int e4crypt_set_directory_policy(const char* dir)
 
     return 0;
 }
+
+int e4crypt_set_user_crypto_policies(const char* dir)
+{
+    auto command = std::string() + "cryptfs setusercryptopolicies " + dir;
+    auto result = vold_command(command);
+    // ext4enc:TODO proper error handling
+    KLOG_INFO(TAG, "setusercryptopolicies returned with result %s\n",
+              result.c_str());
+    return 0;
+}

diff --git a/ext4_utils/ext4_crypt_init_extensions.h b/ext4_utils/ext4_crypt_init_extensions.h
index 7931124..d02d181 100644 (file)
--- a/ext4_utils/ext4_crypt_init_extensions.h
+++ b/ext4_utils/ext4_crypt_init_extensions.h
@@ -11,5 +11,6 @@ int e4crypt_create_device_key(const char* path,
 int e4crypt_set_directory_policy(const char* path);
 bool e4crypt_non_default_key(const char* path);
 int do_policy_set(const char *directory, const char *policy, int policy_length);
+int e4crypt_set_user_crypto_policies(const char* path);
 
 __END_DECLS

diff --git a/tests/workloads/atrace-uncompress.py b/tests/workloads/atrace-uncompress.py
index 5efb698..d478e74 100644 (file)
--- a/tests/workloads/atrace-uncompress.py
+++ b/tests/workloads/atrace-uncompress.py
@@ -6,7 +6,7 @@
 import sys, zlib
 
 def main():
-
+       
        if len(sys.argv) != 2:
                print >> sys.stderr, ('Usage: %s inputfile' % sys.argv[0])
                sys.exit(1)