Fix regression with defaultDisplay adjustments am: f02523bf4b

am: be75a58447 Change-Id: I748eaefa1a99b9af5101177090cf906267620f0b
2016-10-18 23:03:51 +00:00
parent 4fbbfc3088 be75a58447
commit cc903f425a
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);