commit c33bf55c09b626bd5262e7625f8e4dd62227fa42
author Jack Palevich <jackpal@google.com> Thu Feb 03 15:25:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 03 15:25:52 2011 -0800
tree 539dba270df9f5b489d93cb0d9e20ad8767cf16c
parent 23a8a45928c85d779e894b6e82697537194b9e4a
parent 5f89f510f327228d4ba2261aff7e8faa7d3715aa

Merge "Throw an exception when trying to upload a recycled bitmap."

opengl/java/android/opengl/GLUtils.java

diff --git a/opengl/java/android/opengl/GLUtils.java b/opengl/java/android/opengl/GLUtils.java
index e150c19..2f17072 100644
--- a/opengl/java/android/opengl/GLUtils.java
+++ b/opengl/java/android/opengl/GLUtils.java
@@ -142,6 +142,9 @@
         if (bitmap == null) {
             throw new NullPointerException("texImage2D can't be used with a null Bitmap");
         }
+        if (bitmap.isRecycled()) {
+            throw new IllegalArgumentException("bitmap is recycled");
+        }
         if (native_texImage2D(target, level, -1, bitmap, -1, border)!=0) {
             throw new IllegalArgumentException("invalid Bitmap format");
         }