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

Merge "Do not rebase Resources with non RM impls" into rvc-dev am: a132d3b5e2

Browse Source 
Change-Id: I30b4978a1ccdb000ea50c00a2400e1b9befee6d3
This commit is contained in:
Automerger Merge Worker
2020-03-02 20:26:12 +00:00
parent d162225e0e a132d3b5e2
commit de373a13fd
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/app/ResourcesManager.java
View File

@@ -961,17 +961,19 @@ public class ResourcesManager {
// Rebase each Resources associated with this Activity. // Rebase each Resources associated with this Activity.
final int refCount = activityResources.activityResources.size(); final int refCount = activityResources.activityResources.size();
for (int i = 0; i < refCount; i++) { for (int i = 0; i < refCount; i++) {
WeakReference<Resources> weakResRef = activityResources.activityResources.get( final WeakReference<Resources> weakResRef =
i); activityResources.activityResources.get(i);
Resources resources = weakResRef.get(); final Resources resources = weakResRef.get();
if (resources == null) { if (resources == null) {
continue; continue;
} }
ResourcesKey newKey = rebaseActivityOverrideConfig(resources, oldConfig, final ResourcesKey newKey = rebaseActivityOverrideConfig(resources, oldConfig,
overrideConfig, displayId); overrideConfig, displayId);
updateActivityResources(resources, newKey, false); if (newKey != null) {
updateActivityResources(resources, newKey, false);
}
} }
} }
} finally { } finally {
@@ -983,8 +985,9 @@ public class ResourcesManager {
* Rebases an updated override config over any old override config and returns the new one * Rebases an updated override config over any old override config and returns the new one
* that an Activity's Resources should be set to. * that an Activity's Resources should be set to.
*/ */
private ResourcesKey rebaseActivityOverrideConfig(Resources resources, @Nullable
Configuration oldOverrideConfig, @Nullable Configuration newOverrideConfig, private ResourcesKey rebaseActivityOverrideConfig(@NonNull Resources resources,
@NonNull Configuration oldOverrideConfig, @Nullable Configuration newOverrideConfig,
int displayId) { int displayId) {
// Extract the ResourcesKey that was last used to create the Resources for this // Extract the ResourcesKey that was last used to create the Resources for this
// activity. // activity.