diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index d8a3d4f3fa075..f411178585989 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.