diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-19 22:14:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-19 22:14:44 -0800 |
| commit | 77852d344be2f56152be52af8f2dae5d8b2cc9b7 (patch) | |
| tree | 1a761e660b676d495ef9ce28c5a191439085b163 /src/com | |
| parent | 14566e340e1d966135f937b0a646a7b54cde7d44 (diff) | |
| parent | 8be9b08d3bb0e18f167a74d745abe40153fff1de (diff) | |
| download | android_packages_apps_Gallery2-77852d344be2f56152be52af8f2dae5d8b2cc9b7.tar.gz android_packages_apps_Gallery2-77852d344be2f56152be52af8f2dae5d8b2cc9b7.tar.bz2 android_packages_apps_Gallery2-77852d344be2f56152be52af8f2dae5d8b2cc9b7.zip | |
Merge "Gallery2: fix a crash caused by NullPointerException."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/ui/TimeLineSlotRenderer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java index 5483647e7..adad59c01 100644 --- a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java +++ b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java @@ -201,6 +201,7 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer { TimeLineSlidingWindow.AlbumEntry entry = mDataWindow.get(index); int renderRequestFlags = 0; + if (entry != null) { Texture content = checkContentTexture(entry.content); if (content == null) { content = mWaitLoadingTexture; @@ -221,7 +222,7 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer { } renderRequestFlags |= renderOverlay(canvas, index, entry, width, height); - + } return renderRequestFlags; } } |