summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-05-18 14:43:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-18 14:43:53 -0700
commit4235e034171b4eb74969b429e711ac062f56bbdc (patch)
tree992e8d760c37b49c1def6b97630addef5e66a698 /libs
parent2b57689d8b1f1634f5b55eeb207bb199de16f644 (diff)
parentbca2d5b3df1394ae2bdfe1e9b65a75276754eadb (diff)
downloadframeworks_base-4235e034171b4eb74969b429e711ac062f56bbdc.zip
frameworks_base-4235e034171b4eb74969b429e711ac062f56bbdc.tar.gz
frameworks_base-4235e034171b4eb74969b429e711ac062f56bbdc.tar.bz2
Merge "Disable error report temporarily to enable inline video"
Diffstat (limited to 'libs')
-rw-r--r--libs/gui/SurfaceTexture.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index d7c449c..b08a5a8 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -292,7 +292,8 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,
LOGE("dequeueBuffer: MIN_UNDEQUEUED_BUFFERS=%d exceeded (dequeued=%d)",
MIN_UNDEQUEUED_BUFFERS-int(mSynchronousMode),
dequeuedCount);
- return -EBUSY;
+ // TODO: Enable this error report after we fix issue 4435022
+ // return -EBUSY;
}
// we're in synchronous mode and didn't find a buffer, we need to wait