summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-09-03 21:23:37 +0000
committerGerrit Code Review <gerrit2@cyanogenmod.teamdouche.net>2010-09-03 21:23:37 +0000
commit2620358ffb58a2347b904f5c8adc23179168e977 (patch)
treebb13ebc8543d23d7b1c1171db26a0b5c52f722cb
parent1714279f85a938ba049301a7e0719921cd575147 (diff)
parent588096697a65a5275f1010a13326fee03d4096cc (diff)
downloadframeworks_base-2620358ffb58a2347b904f5c8adc23179168e977.zip
frameworks_base-2620358ffb58a2347b904f5c8adc23179168e977.tar.gz
frameworks_base-2620358ffb58a2347b904f5c8adc23179168e977.tar.bz2
Merge "framework: Fix for race condition in NativeDaemonConnector." into froyo
-rw-r--r--services/java/com/android/server/NativeDaemonConnector.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/NativeDaemonConnector.java b/services/java/com/android/server/NativeDaemonConnector.java
index 08d7ce6..7f0c4f2 100644
--- 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;