commit b901c9abff6b3885e1efce2e643b1f8e5ef3fc79
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 efd162601f4105c50e8d106530794a40389d8ac5
parent 4b7c1cacca252f735d23f7e01885214630d83f32
parent 9204644d9e8fc2a3d05ff386b14b349f7a117694

am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  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;