Merge "SurfaceTexture: fix updateTexImage JNI"

Jamie Gennis · Android (Google) Code Review · commit 75bf74460d05 · 2012-04-13T20:33:01.000-07:00
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -220,7 +220,7 @@ static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)
     if (err == INVALID_OPERATION) {
         jniThrowException(env, IllegalStateException, "Unable to update texture contents (see "
                 "logcat for details)");
-    } else {
+    } else if (err < 0) {
         jniThrowRuntimeException(env, "Error during updateTexImage (see logcat for details)");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)`
`220`	`220`	`if (err == INVALID_OPERATION) {`
`221`	`221`	`jniThrowException(env, IllegalStateException, "Unable to update texture contents (see "`
`222`	`222`	`"logcat for details)");`
`223`		`- } else {`
	`223`	`+ } else if (err < 0) {`
`224`	`224`	`jniThrowRuntimeException(env, "Error during updateTexImage (see logcat for details)");`
`225`	`225`	`}`
`226`	`226`	`}`