diff options
| author | jinwu <jinwu@codeaurora.org> | 2017-05-16 19:56:16 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-30 03:14:10 -0700 |
| commit | 290822c84e25e2ec1893000fc08925c8aedefcc6 (patch) | |
| tree | 9904144944efc16b67b162d972bb13f5659116a5 | |
| parent | 8e50cf54bd699e44339a215dfbd50af3cc054a3c (diff) | |
| download | android_packages_apps_Gallery2-290822c84e25e2ec1893000fc08925c8aedefcc6.tar.gz android_packages_apps_Gallery2-290822c84e25e2ec1893000fc08925c8aedefcc6.tar.bz2 android_packages_apps_Gallery2-290822c84e25e2ec1893000fc08925c8aedefcc6.zip | |
Fix crash at java.lang.RuntimeException: Texture load fail, no bitmap
catch Exception and cancel upload task.
Change-Id: I6b1a217b179f176d5922d9526366f12b37812ebf
CRs-Fixed: 2043134
| -rw-r--r-- | src/com/android/gallery3d/glrenderer/UploadedTexture.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java index 4d196f890..0589bcc65 100644 --- a/src/com/android/gallery3d/glrenderer/UploadedTexture.java +++ b/src/com/android/gallery3d/glrenderer/UploadedTexture.java @@ -189,7 +189,12 @@ public abstract class UploadedTexture extends BasicTexture { if (mThrottled && ++sUploadedCount > UPLOAD_LIMIT) { return; } - uploadToCanvas(canvas); + try { + uploadToCanvas(canvas); + } catch (RuntimeException e) { + mContentValid = true; + e.printStackTrace(); + } } else if (!mContentValid) { Bitmap bitmap = getBitmap(); int format = GLUtils.getInternalFormat(bitmap); |