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

2016-10-18 22:46:22 +00:00
parent 52af7e0759 f02523bf4b
commit 0858d08a88
1 changed files with 4 additions and 1 deletions
--- 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);