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

* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79': Fix a race condition in NativeDaemonConnector
2011-02-07 10:07:46 -08:00
parent 6b497a0446 b901c9abff
commit a62bf8bb6b
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;