diff options
| author | Alan Viverette <alanv@google.com> | 2015-01-05 11:09:29 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-01-05 11:09:29 -0800 |
| commit | d6ebb3a75ef9c87ff5294462dc0637ca802d1e59 (patch) | |
| tree | 6abccf3a6021556636d386433fff5818b628f121 /core/java/android/content | |
| parent | 74f89e78b0e0dfb6fab15cea1f1ca19ee45b0875 (diff) | |
| download | frameworks_base-d6ebb3a75ef9c87ff5294462dc0637ca802d1e59.zip frameworks_base-d6ebb3a75ef9c87ff5294462dc0637ca802d1e59.tar.gz frameworks_base-d6ebb3a75ef9c87ff5294462dc0637ca802d1e59.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |