commit 6e5a04af0d34f40f6c6fabd51ec4a37ef46afee9
author Brad Fitzpatrick <bradfitz@android.com> Mon Feb 07 10:04:54 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 07 10:04:54 2011 -0800
tree 2790c3c4d41a5fb07176231b4b77c13938212373
parent bc1c40a4846136ab2dfb6d558bb0a43ac6294030
parent c6a47e98717df6980abc56c93a0dcc83c71f9d96

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

* commit 'c6a47e98717df6980abc56c93a0dcc83c71f9d96':
  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 cf87a9d..88d94c2 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;