Merge "Remove null entries from constant state cache"

2015-01-05 19:12:01 +00:00
parent 3197c5da90 d6ebb3a75e
commit a850300fd5
1 changed files with 1 additions and 1 deletions
--- 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);
            }
        }