Merge "Error check in queuebuffer in SurfaceTextureClient"

psanketi · Android (Google) Code Review · commit b69d9324347e · 2011-09-02T18:40:04.000-07:00
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp
@@ -219,9 +219,12 @@ int SurfaceTextureClient::queueBuffer(android_native_buffer_t* buffer) {
     if (i < 0) {
         return i;
     }
-    mSurfaceTexture->queueBuffer(i, timestamp,
+    status_t err = mSurfaceTexture->queueBuffer(i, timestamp,
             &mDefaultWidth, &mDefaultHeight, &mTransformHint);
-    return OK;
+    if (err != OK)  {
+        LOGE("queueBuffer: error queuing buffer to SurfaceTexture, %d", err);
+    }
+    return err;
 }
 
 int SurfaceTextureClient::query(int what, int* value) const {

Original file line number	Diff line number	Diff line change
`@@ -219,9 +219,12 @@ int SurfaceTextureClient::queueBuffer(android_native_buffer_t* buffer) {`
`219`	`219`	`if (i < 0) {`
`220`	`220`	`return i;`
`221`	`221`	`}`
`222`		`- mSurfaceTexture->queueBuffer(i, timestamp,`
	`222`	`+ status_t err = mSurfaceTexture->queueBuffer(i, timestamp,`
`223`	`223`	`&mDefaultWidth, &mDefaultHeight, &mTransformHint);`
`224`		`- return OK;`
	`224`	`+ if (err != OK) {`
	`225`	`+ LOGE("queueBuffer: error queuing buffer to SurfaceTexture, %d", err);`
	`226`	`+ }`
	`227`	`+ return err;`
`225`	`228`	`}`
`226`	`229`
`227`	`230`	`int SurfaceTextureClient::query(int what, int* value) const {`