commit 76852898612aca637dc6726b6c11672f31b9d6e3
author The Android Automerger <android-build@google.com> Thu Jun 06 05:55:09 2013 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 06 05:55:09 2013 -0700
tree d0c2797379a505fc33b006c36036df0454847cf7
parent 1b87456faa939b8a76a54336818131fb72b85ca6
parent 80fb025e6c886f2a4fced38c93307051e7528885

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

opengl/system/OpenglSystemCommon/QemuPipeStream.cpp

diff --git a/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp b/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp
index 50c3d8b..a55dca0 100644
--- a/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -40,6 +40,7 @@
 QemuPipeStream::~QemuPipeStream()
 {
     if (m_sock >= 0) {
+        flush();
         ::close(m_sock);
     }
     if (m_buf != NULL) {

opengl/system/renderControl_enc/renderControl_enc.cpp

diff --git a/opengl/system/renderControl_enc/renderControl_enc.cpp b/opengl/system/renderControl_enc/renderControl_enc.cpp
index 94e256a..41f59d0 100644
--- a/opengl/system/renderControl_enc/renderControl_enc.cpp
+++ b/opengl/system/renderControl_enc/renderControl_enc.cpp
@@ -311,6 +311,8 @@
 	memcpy(ptr, &packetSize, 4);  ptr += 4;
 
 		memcpy(ptr, &colorbuffer, 4); ptr += 4;
+
+	stream->flush();
 }
 
 void rcSetWindowColorBuffer_enc(void *self , uint32_t windowSurface, uint32_t colorBuffer)