From: Paul Lawrence <paullawrence@google.com>
Date: Wed, 3 Jun 2015 21:18:17 +0000 (-0700)
Subject: Move crypt commands to a different listener in vold
X-Git-Tag: android-x86-6.0-r1~26
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fsystem-extras.git;a=commitdiff_plain;h=b411bcc138293db5e09c1f5af638115b3c7c18f8

Move crypt commands to a different listener in vold

In order to prevent this bug from happening, we must allow vold cryptfs
commands to complete while a long running mount is underway.

While waiting for vold to be changed to a binder interface, we will simply
create two listeners, one for cryptfs and one for everything else.

Bug: 19197175
Change-Id: Id87764ed68c169fc6b94ea4f4f7a51a7ec9c7564
---

diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp
index cae1f7f6..7ae076a3 100644
--- a/ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/ext4_utils/ext4_crypt_init_extensions.cpp
@@ -26,7 +26,7 @@ static std::string vold_command(std::string const& command)
     int sock = -1;
 
     while (true) {
-        sock = socket_local_client("vold",
+        sock = socket_local_client("cryptd",
                                    ANDROID_SOCKET_NAMESPACE_RESERVED,
                                    SOCK_STREAM);
         if (sock >= 0) {