Merge "simpleperf: add META_INFO feature section in perf.data."

diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp
index 746d835..732060d 100644 (file)
--- a/ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/ext4_utils/ext4_crypt_init_extensions.cpp
@@ -55,15 +55,6 @@ int e4crypt_install_keyring()
     return 0;
 }
 
-int e4crypt_do_init_user0()
-{
-    const char* argv[] = { "/system/bin/vdc", "--wait", "cryptfs", "init_user0" };
-    int rc = android_fork_execvp_ext(arraysize(argv), (char**) argv, NULL, false,
-                                     LOG_KLOG, false, NULL, NULL, 0);
-    LOG(INFO) << "init_user0 result: " << rc;
-    return rc;
-}
-
 int e4crypt_set_directory_policy(const char* dir)
 {
     // Only set policy on first level /data directories

diff --git a/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h b/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h
index e208b45..f14d4a9 100644 (file)
--- a/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h
+++ b/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h
@@ -27,7 +27,6 @@ __BEGIN_DECLS
 // They will not operate properly outside of init
 int e4crypt_install_keyring();
 int e4crypt_set_directory_policy(const char* path);
-int e4crypt_do_init_user0();
 
 __END_DECLS