diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-21 13:58:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-21 13:58:01 -0800 |
| commit | e3a5ddeedc2dc81ff57f973f228cd80d472924aa (patch) | |
| tree | 6722463e58ee6c75d1ab57711f0823abb6838971 | |
| parent | 96dbdca1c7c62c5dfd4d9404cce052c6b52c2c1d (diff) | |
| parent | cb07c05b9be20420b336d1d0cbc5e136f5d6337c (diff) | |
| download | android_packages_apps_Gallery2-e3a5ddeedc2dc81ff57f973f228cd80d472924aa.tar.gz android_packages_apps_Gallery2-e3a5ddeedc2dc81ff57f973f228cd80d472924aa.tar.bz2 android_packages_apps_Gallery2-e3a5ddeedc2dc81ff57f973f228cd80d472924aa.zip | |
Merge "Gallery2: Fix Gallery2 crash caused by monkey test."
| -rw-r--r-- | src/com/android/gallery3d/glrenderer/UploadedTexture.java | 7 |
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) { |