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: Ie02a2524c157dd3bd585d25eb5b3e00b1d7a42c9
This commit is contained in:
Automerger Merge Worker
2020-03-02 20:26:28 +00:00
parent af52f4647a a132d3b5e2
commit d610a2957d
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.
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);
updateActivityResources(resources, newKey, false);
if (newKey != null) {
updateActivityResources(resources, newKey, false);
}
}
}
} finally {
@@ -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.