From f02523bf4bf898cb2ecff262429e31b74f2ad6ab Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Tue, 18 Oct 2016 12:58:27 -0700 Subject: [PATCH] Fix regression with defaultDisplay adjustments ag/1542219 introduced a regression where if the display was the default display, the configuration would still be adjusted as if it were a non-default display. This fixes that logic to only adjust the configuration if the display is non-default. Bug:32133693 Test: cts-tradefed run cts --module CtsServicesHostTestCases --test android.server.cts.ActivityManagerAppConfigurationTests#testConfigurationUpdatesWhenRotatingToSideFromDocked Change-Id: Ib2fda8c1651609efa9d20b3e2dace8a122864916 --- core/java/android/app/ResourcesManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- 2.11.0