summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
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
commit8a626914e388a57c2378c86e82b24158d6098330 (patch)
treebf799b850a8a05db1cf931aca06a8b25eb324173 /src/com/android/gallery3d/ui
parent59d6f1b97c7159dd9faead8872f2d583dbb49ac8 (diff)
downloadandroid_packages_apps_Gallery2-8a626914e388a57c2378c86e82b24158d6098330.tar.gz
android_packages_apps_Gallery2-8a626914e388a57c2378c86e82b24158d6098330.tar.bz2
android_packages_apps_Gallery2-8a626914e388a57c2378c86e82b24158d6098330.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/com/android/gallery3d/ui')
-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();
}
}