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

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

Change-Id: I91cecfc1b5942d7e1c069e739be72a23472f6d47
This commit is contained in:
Adam Lesinski
2016-05-05 23:35:28 +00:00
committed by android-build-merger
parent f1febf2700 c1ff12eccd
commit 001f8c57a8
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.