am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchop

* commit 'd8293fbf284a8375da7473660c2ffeddfc08189e': Null check in flushInvalidIcons
2014-09-17 20:46:27 +00:00
parent 4824965fc5 d8293fbf28
commit 7b0982d819
1 changed files with 2 additions and 1 deletions
@@ -229,7 +229,8 @@ public class IconCache {
            Iterator<Entry<CacheKey, CacheEntry>> it = mCache.entrySet().iterator();
            while (it.hasNext()) {
                final CacheEntry e = it.next().getValue();
-                if (e.icon.getWidth() < grid.iconSizePx || e.icon.getHeight() < grid.iconSizePx) {
+                if ((e.icon != null) && (e.icon.getWidth() < grid.iconSizePx
+                        || e.icon.getHeight() < grid.iconSizePx)) {
                    it.remove();
                }
            }