summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-05-17 13:04:35 -0700
committerOwen Lin <owenlin@google.com>2012-05-17 13:09:26 -0700
commit8f7b76df88c4468b54a9977f2687d5fcab19ba7d (patch)
tree777d8fafd4d5d43b17eed9717629fa0e0c8f9a4e /src
parent93300e13d5ae3b4e4c532a90fc7f763ec62cbb8c (diff)
downloadandroid_packages_apps_Snap-8f7b76df88c4468b54a9977f2687d5fcab19ba7d.tar.gz
android_packages_apps_Snap-8f7b76df88c4468b54a9977f2687d5fcab19ba7d.tar.bz2
android_packages_apps_Snap-8f7b76df88c4468b54a9977f2687d5fcab19ba7d.zip
Fix a NPE found by Moneky.
AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth() has never been called or called with width as 0. bug:6510386 Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/AlbumLabelMaker.java2
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();
}
}