1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java
index f41a979b7..546d9f398 100644
--- a/src/com/android/gallery3d/glrenderer/UploadedTexture.java
+++ b/src/com/android/gallery3d/glrenderer/UploadedTexture.java
@@ -221,8 +221,11 @@ public abstract class UploadedTexture extends BasicTexture {
 
                 Assert.assertTrue(bWidth <= texWidth && bHeight <= texHeight);
 
-                // Upload the bitmap to a new texture.
-                mId = canvas.getGLId().generateTexture();
+                // Null pointer check here is to avoid monkey test failure.
+                if (canvas.getGLId() != null) {
+                    // Upload the bitmap to a new texture.
+                    mId = canvas.getGLId().generateTexture();
+                }
                 canvas.setTextureParameters(this);
 
                 if (bWidth == texWidth && bHeight == texHeight) {