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 am: c1ff12eccd

Browse Source 
am: 3297250b9c

* commit '3297250b9cc068715d36c039133db5bf0083b9cc':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1f9dfebf5deb3d1a9cf49cc9042a02a90c3c7a68
This commit is contained in:
Adam Lesinski
2016-05-05 23:40:25 +00:00
committed by android-build-merger
parent 6674151189 3297250b9c
commit 77acaf86b3
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) {
final ActivityResources activityResources =
getOrCreateActivityResourcesStructLocked(
activityToken);
if (overrideConfig != null) {
activityResources.overrideConfig.setTo(overrideConfig);
} else {
activityResources.overrideConfig.setToDefaults();
}
// Force the creation of an ActivityResourcesStruct.
getOrCreateActivityResourcesStructLocked(activityToken);
}
// Update any existing Activity Resources references.