summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-04-13 20:33:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-13 20:33:01 -0700
commit75bf74460d057c0e21d707061407844c22fb4113 (patch)
treef6320bf7b8ed9c01ccb2934c7c3034678b9fd3ee
parentdd0c13060dc385da3f264a3c08d766826565b6bf (diff)
parent721bfaa63d14f0ac858d32431ab2eff582143b0f (diff)
downloadframeworks_base-75bf74460d057c0e21d707061407844c22fb4113.zip
frameworks_base-75bf74460d057c0e21d707061407844c22fb4113.tar.gz
frameworks_base-75bf74460d057c0e21d707061407844c22fb4113.tar.bz2
Merge "SurfaceTexture: fix updateTexImage JNI"
-rw-r--r--core/jni/android/graphics/SurfaceTexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
index 77ad11e..c48b974 100644
--- 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)");
}
}