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

* commit 'a62bf8bb6b7a547802fb384b497e955940befa9c':
  Fix a race condition in NativeDaemonConnector
This commit is contained in:
Brad Fitzpatrick
2011-02-07 10:09:29 -08:00
committed by Android Git Automerger

View File

@@ -97,11 +97,12 @@ final class NativeDaemonConnector implements Runnable {
LocalSocketAddress.Namespace.RESERVED); LocalSocketAddress.Namespace.RESERVED);
socket.connect(address); socket.connect(address);
mCallbacks.onDaemonConnected();
InputStream inputStream = socket.getInputStream(); InputStream inputStream = socket.getInputStream();
mOutputStream = socket.getOutputStream(); mOutputStream = socket.getOutputStream();
mCallbacks.onDaemonConnected();
byte[] buffer = new byte[BUFFER_SIZE]; byte[] buffer = new byte[BUFFER_SIZE];
int start = 0; int start = 0;