commit 7b0982d819b2baf5e4061f5d64a6b7b3da459e7f
author Sunny Goyal <sunnygoyal@google.com> Wed Sep 17 20:46:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 17 20:46:27 2014 +0000
tree 69b524c9528791d0da19a6784b6fc859cb5cf1d3
parent 4824965fc5b403d3ca5018f65077d953e3b80b42
parent d8293fbf284a8375da7473660c2ffeddfc08189e

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

* commit 'd8293fbf284a8375da7473660c2ffeddfc08189e':
  Null check in flushInvalidIcons

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index ddc1bd9..8a3c319 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -229,7 +229,8 @@
             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();
                 }
             }