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

2016-05-05 23:23:41 +00:00
parent 7d2a0a0571 8ce4e12c73
commit c1ff12eccd
1 changed files with 2 additions and 9 deletions
--- 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.