From e60064ab3c399fdd084de11dada73af48735d2fc Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 13 Jul 2016 12:09:24 -0700 Subject: Don't hold on to AssetManager instances If we enter multi-window mode or load WebView assets into a Resources object, then the underlying AssetManager instance may change. crbug.com/627586 Bug:30118654 Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e --- core/java/android/content/res/TypedArray.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 92134ee01de8..1e44a5ccafc9 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -49,6 +49,10 @@ public class TypedArray { attrs.mLength = len; 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; if (attrs.mData.length >= fullLen) { return attrs; @@ -66,7 +70,7 @@ public class TypedArray { private final Resources mResources; private final DisplayMetrics mMetrics; - private final AssetManager mAssets; + private AssetManager mAssets; private boolean mRecycled; @@ -1086,6 +1090,7 @@ public class TypedArray { // These may have been set by the client. mXml = null; mTheme = null; + mAssets = null; mResources.mTypedArrayPool.release(this); } -- cgit v1.2.3-59-g8ed1b