commit 7816eded417357561496df19dfa711be5586f3b0
author David 'Digit' Turner <digit@google.com> Fri Jul 08 18:19:01 2011 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 08 18:19:01 2011 +0200
tree 57fa09de7c2b5772bd36f2cc67ef6072167e9145
parent 4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89
parent 2435a927f30efe38c673bfaed64a9880028da9e8

merge intel x86 patches into gingerbread branch

libs/rs/rsNoise.cpp

diff --git a/libs/rs/rsNoise.cpp b/libs/rs/rsNoise.cpp
index 764dc1a..4b67586 100644
--- a/libs/rs/rsNoise.cpp
+++ b/libs/rs/rsNoise.cpp
@@ -253,4 +253,4 @@
 }
 
 }
-}
\ No newline at end of file
+}

opengl/tests/gl_jni/jni/gl_code.cpp

diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp
index f031c79..ef66841 100644
--- a/opengl/tests/gl_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl_jni/jni/gl_code.cpp
@@ -181,4 +181,3 @@
 {
     background = 1.0f - background;
 }
-

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..88af1b2 100644
--- a/services/java/com/android/server/NativeDaemonConnector.java
+++ b/services/java/com/android/server/NativeDaemonConnector.java
@@ -97,10 +97,11 @@
                     LocalSocketAddress.Namespace.RESERVED);
 
             socket.connect(address);
+
+            mOutputStream = socket.getOutputStream();
             mCallbacks.onDaemonConnected();
 
             InputStream inputStream = socket.getInputStream();
-            mOutputStream = socket.getOutputStream();
 
             byte[] buffer = new byte[BUFFER_SIZE];
             int start = 0;