Skip to content

Commit 7816ede

Browse files
committed
merge intel x86 patches into gingerbread branch
2 parents 4d825e1 + 2435a92 commit 7816ede

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

libs/rs/rsNoise.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,4 @@ float SC_turbulencef3(float x, float y, float z, float octaves)
253253
}
254254

255255
}
256-
}
256+
}

opengl/tests/gl_jni/jni/gl_code.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
181181
{
182182
background = 1.0f - background;
183183
}
184-

services/java/com/android/server/NativeDaemonConnector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@ private void listenToSocket() throws IOException {
9797
LocalSocketAddress.Namespace.RESERVED);
9898

9999
socket.connect(address);
100+
101+
mOutputStream = socket.getOutputStream();
100102
mCallbacks.onDaemonConnected();
101103

102104
InputStream inputStream = socket.getInputStream();
103-
mOutputStream = socket.getOutputStream();
104105

105106
byte[] buffer = new byte[BUFFER_SIZE];
106107
int start = 0;

0 commit comments

Comments
 (0)