Merge "Always propagate changingConfigurations to newly-created drawables" (af4fac5b) · Commits · e / os / android_frameworks_base

core/java/android/content/res/ResourcesImpl.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -553,6 +553,7 @@ public class ResourcesImpl {
		if (!mPreloading && useCache) {
		final Drawable cachedDrawable = caches.getInstance(key, wrapper, theme);
		if (cachedDrawable != null) {
		cachedDrawable.setChangingConfigurations(value.changingConfigurations);
		return cachedDrawable;
		}
		}
		@@ -588,10 +589,12 @@ public class ResourcesImpl {
		// If we were able to obtain a drawable, store it in the appropriate
		// cache: preload, not themed, null theme, or theme-specific. Don't
		// pollute the cache with drawables loaded from a foreign density.
		if (dr != null && useCache) {
		if (dr != null) {
		dr.setChangingConfigurations(value.changingConfigurations);
		if (useCache) {
		cacheDrawable(value, isColorDrawable, caches, theme, canApplyTheme, key, dr);
		}
		}

		return dr;
		} catch (Exception e) {