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

Merge "Don't hold on to AssetManager instances" into nyc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2016-07-14 01:40:34 +00:00
committed by Android (Google) Code Review
parent 9604b3803c e60064ab3c
commit f8e99e72e7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/res/TypedArray.java
View File

@@ -49,6 +49,10 @@ public class TypedArray {
attrs.mLength = len; attrs.mLength = len;
attrs.mRecycled = false; attrs.mRecycled = false;
// Reset the assets, which may have changed due to configuration changes
// or further resource loading.
attrs.mAssets = res.getAssets();
final int fullLen = len * AssetManager.STYLE_NUM_ENTRIES; final int fullLen = len * AssetManager.STYLE_NUM_ENTRIES;
if (attrs.mData.length >= fullLen) { if (attrs.mData.length >= fullLen) {
return attrs; return attrs;
@@ -66,7 +70,7 @@ public class TypedArray {
private final Resources mResources; private final Resources mResources;
private final DisplayMetrics mMetrics; private final DisplayMetrics mMetrics;
private final AssetManager mAssets; private AssetManager mAssets;
private boolean mRecycled; private boolean mRecycled;
@@ -1086,6 +1090,7 @@ public class TypedArray {
// These may have been set by the client. // These may have been set by the client.
mXml = null; mXml = null;
mTheme = null; mTheme = null;
mAssets = null;
mResources.mTypedArrayPool.release(this); mResources.mTypedArrayPool.release(this);
} }