Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f02523bf authored by Adam Lesinski's avatar Adam Lesinski
Browse files

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
parent c23c9dd7

core/java/android/app/ResourcesManager.java

+4 −1
Original line number Diff line number Diff line
@@ -850,7 +850,10 @@ public class ResourcesManager { 
                            daj.setCompatibilityInfo(compat);

                        }

                        dm = getDisplayMetrics(displayId, daj);



                        if (!isDefaultDisplay) {

                            applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);

                        }



                        if (hasOverrideConfiguration) {

                            tmpConfig.updateFrom(key.mOverrideConfiguration);