diff options
| author | jinwu <jinwu@codeaurora.org> | 2017-04-21 14:12:30 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-05 01:30:59 -0700 |
| commit | 4291465185bfe2a2bd3eea334e5a0cc2efaeae6c (patch) | |
| tree | 3bbef65ee788acb526d86b2177e6b8ec731d271c | |
| parent | 87fa6e8341e295fb4146f6544a6ea2ff01100488 (diff) | |
| download | android_packages_apps_Gallery2-4291465185bfe2a2bd3eea334e5a0cc2efaeae6c.tar.gz android_packages_apps_Gallery2-4291465185bfe2a2bd3eea334e5a0cc2efaeae6c.tar.bz2 android_packages_apps_Gallery2-4291465185bfe2a2bd3eea334e5a0cc2efaeae6c.zip | |
Fix the NPE of Bitmap.getWidth() in monkey test
If get bitmap is nul, then return.
Change-Id: Id2ed737c3a0ca4722144b05406d7be5454e657c4
CRs-Fixed: 2027320
| -rw-r--r-- | src/com/android/gallery3d/glrenderer/UploadedTexture.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java index d67762abd..4d196f890 100644 --- a/src/com/android/gallery3d/glrenderer/UploadedTexture.java +++ b/src/com/android/gallery3d/glrenderer/UploadedTexture.java @@ -134,6 +134,7 @@ public abstract class UploadedTexture extends BasicTexture { private Bitmap getBitmap() { if (mBitmap == null) { mBitmap = onGetBitmap(); + if (mBitmap == null)return null; int w = mBitmap.getWidth() + mBorder * 2; int h = mBitmap.getHeight() + mBorder * 2; if (mWidth == UNSPECIFIED) { |