diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 1001e2753d882..2e2c5d92cdf15 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -2463,7 +2463,7 @@ public class Resources { final int N = cache.size(); for (int i = N - 1; i >= 0; i--) { final WeakReference entry = cache.valueAt(i); - if (entry.get() == null) { + if (entry == null || entry.get() == null) { cache.removeAt(i); } }