commit c6a47e98717df6980abc56c93a0dcc83c71f9d96
author Brad Fitzpatrick <bradfitz@android.com> Mon Feb 07 09:55:34 2011 -0800
committer Android Code Review <code-review@android.com> Mon Feb 07 09:55:34 2011 -0800
tree 84a9b1bed91ae24f0c12e659495f61b5120f949b
parent 56451a44778af5f289695808e4c06485f26b4bef
parent c4faee0b101024538754b8254cf4c057554f2bea

Merge "Fix a race condition in NativeDaemonConnector"

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;