Merge "Do not rebase Resources with non RM impls" into rvc-dev (a132d3b5) · Commits · e / os / android_frameworks_base

core/java/android/app/ResourcesManager.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -961,19 +961,21 @@ public class ResourcesManager {
		// Rebase each Resources associated with this Activity.
		final int refCount = activityResources.activityResources.size();
		for (int i = 0; i < refCount; i++) {
		WeakReference<Resources> weakResRef = activityResources.activityResources.get(
		i);
		final WeakReference<Resources> weakResRef =
		activityResources.activityResources.get(i);

		Resources resources = weakResRef.get();
		final Resources resources = weakResRef.get();
		if (resources == null) {
		continue;
		}

		ResourcesKey newKey = rebaseActivityOverrideConfig(resources, oldConfig,
		final ResourcesKey newKey = rebaseActivityOverrideConfig(resources, oldConfig,
		overrideConfig, displayId);
		if (newKey != null) {
		updateActivityResources(resources, newKey, false);
		}
		}
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
		}
		@@ -983,8 +985,9 @@ public class ResourcesManager {
		* Rebases an updated override config over any old override config and returns the new one
		* that an Activity's Resources should be set to.
		*/
		private ResourcesKey rebaseActivityOverrideConfig(Resources resources,
		Configuration oldOverrideConfig, @Nullable Configuration newOverrideConfig,
		@Nullable
		private ResourcesKey rebaseActivityOverrideConfig(@NonNull Resources resources,
		@NonNull Configuration oldOverrideConfig, @Nullable Configuration newOverrideConfig,
		int displayId) {
		// Extract the ResourcesKey that was last used to create the Resources for this
		// activity.