diff options
| author | Owen Lin <owenlin@google.com> | 2012-05-17 13:35:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 13:35:41 -0700 |
| commit | 4b56917d18c35bec2f5e64f55c864163f0d518c9 (patch) | |
| tree | 01af91b7ea63c6d4f61ae9db408051c1683394d3 /src/com | |
| parent | 43a80fd806247cb50e81bacda3ad21d210e9ae88 (diff) | |
| parent | 8a626914e388a57c2378c86e82b24158d6098330 (diff) | |
| download | android_packages_apps_Gallery2-4b56917d18c35bec2f5e64f55c864163f0d518c9.tar.gz android_packages_apps_Gallery2-4b56917d18c35bec2f5e64f55c864163f0d518c9.tar.bz2 android_packages_apps_Gallery2-4b56917d18c35bec2f5e64f55c864163f0d518c9.zip | |
Merge "Fix a NPE found by Moneky." into jb-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumLabelMaker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumLabelMaker.java b/src/com/android/gallery3d/ui/AlbumLabelMaker.java index f837092b8..93b37ce13 100644 --- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java +++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java @@ -211,6 +211,6 @@ public class AlbumLabelMaker { } public void clearRecycledLabels() { - mBitmapPool.clear(); + if (mBitmapPool != null) mBitmapPool.clear(); } } |