Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-18 22:46:22 +00:00
committed by Android (Google) Code Review
parent 52af7e0759 f02523bf4b
commit 0858d08a88
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ResourcesManager.java
View File

@@ -850,7 +850,10 @@ public class ResourcesManager {
daj.setCompatibilityInfo(compat); daj.setCompatibilityInfo(compat);
} }
dm = getDisplayMetrics(displayId, daj); dm = getDisplayMetrics(displayId, daj);
applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);
if (!isDefaultDisplay) {
applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);
}
if (hasOverrideConfiguration) { if (hasOverrideConfiguration) {
tmpConfig.updateFrom(key.mOverrideConfiguration); tmpConfig.updateFrom(key.mOverrideConfiguration);