commit 030bc88b4c09a41b0d7dbe249aec55f33d6b8b8a
author anga <anga@syntronic.com> Tue Feb 01 14:10:25 2011 +0100
committer Brad Fitzpatrick <bradfitz@android.com> Mon Feb 07 09:53:59 2011 -0800
tree 965ded9ddc02f09d14a8f07b707e99203918af90
parent bb2e1ef87fe4c5123340035766c759155e6bb90c

Fix a race condition in NativeDaemonConnector

Fixes a race between the onDaemonConnected callback and setting the
mOutputStream in NativeDaemonConnector.

MountService connects to vold using the NativeDaemonConnector.
Throws a “NativeDaemonConnectorException: No output stream!”
when the onDaemonConnected callback in MountService calls the doListCommand.

Change-Id: Ib895bab37f7df680e4362df6366198c0a673c5e9

services/java/com/android/server/NativeDaemonConnector.java

diff --git a/services/java/com/android/server/NativeDaemonConnector.java b/services/java/com/android/server/NativeDaemonConnector.java
index 7b68d68..c0c6c36 100644
--- a/services/java/com/android/server/NativeDaemonConnector.java
+++ b/services/java/com/android/server/NativeDaemonConnector.java
@@ -97,11 +97,12 @@
                     LocalSocketAddress.Namespace.RESERVED);
 
             socket.connect(address);
-            mCallbacks.onDaemonConnected();
 
             InputStream inputStream = socket.getInputStream();
             mOutputStream = socket.getOutputStream();
 
+            mCallbacks.onDaemonConnected();
+
             byte[] buffer = new byte[BUFFER_SIZE];
             int start = 0;