Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use asset cookie in XML block cache key" into nyc-dev

Browse Source 
am: 89dea902c1

* commit '89dea902c184a981392ceca90d28a7b5986952fc':
  Use asset cookie in XML block cache key
This commit is contained in:
Alan Viverette
2016-02-29 21:06:22 +00:00
committed by android-build-merger
parent 0cbe76be29 89dea902c1
commit 993b8abe02
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/android/content/res/Resources.java
View File

@@ -68,6 +68,7 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
/** /**
@@ -119,6 +120,9 @@ public class Resources {
private static final LongSparseArray<android.content.res.ConstantState<ComplexColor>> private static final LongSparseArray<android.content.res.ConstantState<ComplexColor>>
sPreloadedComplexColors = new LongSparseArray<>(); sPreloadedComplexColors = new LongSparseArray<>();
/** Size of the cyclical cache used to map XML files to blocks. */
private static final int XML_BLOCK_CACHE_SIZE = 4;
// Pool of TypedArrays targeted to this Resources object. // Pool of TypedArrays targeted to this Resources object.
final SynchronizedPool<TypedArray> mTypedArrayPool = new SynchronizedPool<>(5); final SynchronizedPool<TypedArray> mTypedArrayPool = new SynchronizedPool<>(5);
@@ -154,8 +158,9 @@ public class Resources {
// Cyclical cache used for recently-accessed XML files. // Cyclical cache used for recently-accessed XML files.
private int mLastCachedXmlBlockIndex = -1; private int mLastCachedXmlBlockIndex = -1;
private final String[] mCachedXmlBlockFiles = new String[4]; private final int[] mCachedXmlBlockCookies = new int[XML_BLOCK_CACHE_SIZE];
private final XmlBlock[] mCachedXmlBlocks = new XmlBlock[4]; private final String[] mCachedXmlBlockFiles = new String[XML_BLOCK_CACHE_SIZE];
private final XmlBlock[] mCachedXmlBlocks = new XmlBlock[XML_BLOCK_CACHE_SIZE];
final AssetManager mAssets; final AssetManager mAssets;
final ClassLoader mClassLoader; final ClassLoader mClassLoader;
@@ -2339,18 +2344,18 @@ public class Resources {
* tools. * tools.
*/ */
public final void flushLayoutCache() { public final void flushLayoutCache() {
final String[] cachedXmlBlockFiles = mCachedXmlBlockFiles; synchronized (mCachedXmlBlocks) {
final XmlBlock[] cachedXmlBlocks = mCachedXmlBlocks; Arrays.fill(mCachedXmlBlockCookies, 0);
synchronized (cachedXmlBlockFiles) { Arrays.fill(mCachedXmlBlockFiles, null);
final int num = cachedXmlBlockFiles.length;
for (int i = 0; i < num; i++) { final XmlBlock[] cachedXmlBlocks = mCachedXmlBlocks;
for (int i = 0; i < XML_BLOCK_CACHE_SIZE; i++) {
final XmlBlock oldBlock = cachedXmlBlocks[i]; final XmlBlock oldBlock = cachedXmlBlocks[i];
if (oldBlock != null) { if (oldBlock != null) {
oldBlock.close(); oldBlock.close();
} }
cachedXmlBlockFiles[i] = null;
cachedXmlBlocks[i] = null;
} }
Arrays.fill(cachedXmlBlocks, null);
} }
} }
@@ -2852,13 +2857,14 @@ public class Resources {
int assetCookie, @NonNull String type) throws NotFoundException { int assetCookie, @NonNull String type) throws NotFoundException {
if (id != 0) { if (id != 0) {
try { try {
final String[] cachedXmlBlockFiles = mCachedXmlBlockFiles; synchronized (mCachedXmlBlocks) {
final XmlBlock[] cachedXmlBlocks = mCachedXmlBlocks; final int[] cachedXmlBlockCookies = mCachedXmlBlockCookies;
synchronized (cachedXmlBlockFiles) { final String[] cachedXmlBlockFiles = mCachedXmlBlockFiles;
final XmlBlock[] cachedXmlBlocks = mCachedXmlBlocks;
// First see if this block is in our cache. // First see if this block is in our cache.
final int num = cachedXmlBlockFiles.length; final int num = cachedXmlBlockFiles.length;
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
if (cachedXmlBlockFiles[i] != null if (cachedXmlBlockCookies[i] == assetCookie && cachedXmlBlockFiles[i] != null
&& cachedXmlBlockFiles[i].equals(file)) { && cachedXmlBlockFiles[i].equals(file)) {
return cachedXmlBlocks[i].newParser(); return cachedXmlBlocks[i].newParser();
} }
@@ -2874,6 +2880,7 @@ public class Resources {
if (oldBlock != null) { if (oldBlock != null) {
oldBlock.close(); oldBlock.close();
} }
cachedXmlBlockCookies[pos] = assetCookie;
cachedXmlBlockFiles[pos] = file; cachedXmlBlockFiles[pos] = file;
cachedXmlBlocks[pos] = block; cachedXmlBlocks[pos] = block;
return block.newParser(); return block.newParser();