diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-05-05 23:23:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-05 23:23:43 +0000 |
| commit | c1ff12eccd0e48ff7feab62387e60ae4010a3cc9 (patch) | |
| tree | 2465cad186085e773e09f5714b363818de88256d /core/java/android | |
| parent | 7d2a0a05715841b582cbaefa3fd0e0a542064556 (diff) | |
| parent | 8ce4e12c73837bda319c56f8b9e36cf310caf85e (diff) | |
Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ResourcesManager.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index d8a3d4f3fa07..f41117858598 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -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. |