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

* commit 'd8293fbf284a8375da7473660c2ffeddfc08189e':
  Null check in flushInvalidIcons
This commit is contained in:
Sunny Goyal authored and Android Git Automerger committed 2014-09-17 20:46:27 +00:00
commit 7b0982d819
1 file changed
+2 -1
+2 -1
View File
@@ -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();
}
}