commit c1ff12eccd0e48ff7feab62387e60ae4010a3cc9
author Adam Lesinski <adamlesinski@google.com> Thu May 05 23:23:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 05 23:23:43 2016 +0000
tree 2465cad186085e773e09f5714b363818de88256d
parent 7d2a0a05715841b582cbaefa3fd0e0a542064556
parent 8ce4e12c73837bda319c56f8b9e36cf310caf85e

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

core/java/android/app/ResourcesManager.java

diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index d8a3d4f..f411178 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -451,15 +451,8 @@
             }
 
             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.