am c6a47e98: Merge "Fix a race condition in NativeDaemonConnector"

* commit 'c6a47e98717df6980abc56c93a0dcc83c71f9d96': Fix a race condition in NativeDaemonConnector
2011-02-07 10:04:54 -08:00
parent bc1c40a484 c6a47e9871
commit 6e5a04af0d
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/NativeDaemonConnector.java
+++ b/services/java/com/android/server/NativeDaemonConnector.java
@@ -97,11 +97,12 @@ final class NativeDaemonConnector implements Runnable {
                    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;