Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 8adec03df8cf..5cc064e5d177 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -850,7 +850,10 @@ public class ResourcesManager {
                             daj.setCompatibilityInfo(compat);
                         }
                         dm = getDisplayMetrics(displayId, daj);
-                        applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);
+
+                        if (!isDefaultDisplay) {
+                            applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);
+                        }
 
                         if (hasOverrideConfiguration) {
                             tmpConfig.updateFrom(key.mOverrideConfiguration);