diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-05-03 13:17:42 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2017-05-03 13:17:42 -0700 |
| commit | 92a95eada1b50f3700ea1a4eeb8e5b7d0a9ab3ef (patch) | |
| tree | c57f6a55bd513be5f23766f99f998fe9706a8902 | |
| parent | c248f1f76182d7f5bf7f8d0a5432b4a7bc2befd2 (diff) | |
| download | extras-92a95eada1b50f3700ea1a4eeb8e5b7d0a9ab3ef.tar.gz | |
Remove e4crypt_do_init_user0
Init is the only user and it no longer uses this.
Test: Boot bullhead, observe that init_user0 still happens
Change-Id: Ie47153e5efd202fd4d8bdc5656a2517adb2d6773
| -rw-r--r-- | ext4_utils/ext4_crypt_init_extensions.cpp | 9 | ||||
| -rw-r--r-- | ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp index 746d835c..732060db 100644 --- 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 e208b451..f14d4a99 100644 --- 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 |