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

Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2016-05-05 23:23:41 +00:00
committed by Android (Google) Code Review
parent 7d2a0a0571 8ce4e12c73
commit c1ff12eccd
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,15 +451,8 @@ public class ResourcesManager {
} }
synchronized (this) { synchronized (this) {
final ActivityResources activityResources = // Force the creation of an ActivityResourcesStruct.
getOrCreateActivityResourcesStructLocked( getOrCreateActivityResourcesStructLocked(activityToken);
activityToken);
if (overrideConfig != null) {
activityResources.overrideConfig.setTo(overrideConfig);
} else {
activityResources.overrideConfig.setToDefaults();
}
} }
// Update any existing Activity Resources references. // Update any existing Activity Resources references.