diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-02-07 10:04:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 10:04:54 -0800 |
| commit | b901c9abff6b3885e1efce2e643b1f8e5ef3fc79 (patch) | |
| tree | efd162601f4105c50e8d106530794a40389d8ac5 /services | |
| parent | 4b7c1cacca252f735d23f7e01885214630d83f32 (diff) | |
| parent | 9204644d9e8fc2a3d05ff386b14b349f7a117694 (diff) | |
| download | frameworks_base-b901c9abff6b3885e1efce2e643b1f8e5ef3fc79.zip frameworks_base-b901c9abff6b3885e1efce2e643b1f8e5ef3fc79.tar.gz frameworks_base-b901c9abff6b3885e1efce2e643b1f8e5ef3fc79.tar.bz2 | |
am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
Fix a race condition in NativeDaemonConnector
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/NativeDaemonConnector.java | 3 |
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 cf87a9d..88d94c2 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; |