diff options
| author | Owen Lin <owenlin@google.com> | 2012-05-17 13:04:35 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-05-18 14:54:14 -0700 |
| commit | 92fc4eb8ea97843b42431eadcfa2277a8b236dc2 (patch) | |
| tree | 9270d40af125bba8e692ee3c14eb9c6e3db27a42 | |
| parent | 0e2dadeb2821e9f8124339c1b08e21d6b964cbb4 (diff) | |
| download | android_packages_apps_Gallery2-92fc4eb8ea97843b42431eadcfa2277a8b236dc2.tar.gz android_packages_apps_Gallery2-92fc4eb8ea97843b42431eadcfa2277a8b236dc2.tar.bz2 android_packages_apps_Gallery2-92fc4eb8ea97843b42431eadcfa2277a8b236dc2.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
| -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(); } } |