merge intel x86 patches into gingerbread branch

3 files changed, 3 insertions, 3 deletions

diff --git a/libs/rs/rsNoise.cpp b/libs/rs/rsNoise.cpp
index 764dc1a8cdd1..4b675861e791 100644
--- a/libs/rs/rsNoise.cpp
+++ b/libs/rs/rsNoise.cpp
@@ -253,4 +253,4 @@ float SC_turbulencef3(float x, float y, float z, float octaves)
 }
 
 }
-}
\ No newline at end of file
+}
diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp
index f031c79cd33e..ef66841f2792 100644
--- a/opengl/tests/gl_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl_jni/jni/gl_code.cpp
@@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
 {
     background = 1.0f - background;
 }
-
diff --git a/services/java/com/android/server/NativeDaemonConnector.java b/services/java/com/android/server/NativeDaemonConnector.java
index cf87a9d3937e..88af1b264dc2 100644
--- a/services/java/com/android/server/NativeDaemonConnector.java
+++ b/services/java/com/android/server/NativeDaemonConnector.java
@@ -97,10 +97,11 @@ final class NativeDaemonConnector implements Runnable {
                     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;