From d6ebb3a75ef9c87ff5294462dc0637ca802d1e59 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 5 Jan 2015 11:09:29 -0800
Subject: Remove null entries from constant state cache

We insert null entries on cache miss, which can cause NPE on prune, but
we ought to remove these entries during prune.

BUG: 18842826
Change-Id: I9c0bca04f34575d1403de943abd8d12b18c9c032
---
 core/java/android/content/res/Resources.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/java/android/content')

diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 1001e27..2e2c5d9 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);
             }
         }
-- 
cgit v1.1