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

Commit 187eb93f authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Fix inconsistency in configuration override when offset 

The config bounds should be offset together when the offset is set to
make the calculation reflects the truth. Also, the config bounds should
be used to calculate the final config bounds. This change fixes the
inconsistency in the calculation process.

Test: check screenHeightDp/screenWidthDp and appBounds after override
Bug: 401087186
Flag: EXEMPT bugfix
Change-Id: I75bb03420c17a8c39088e2733a3ad44c11f5e316
parent a16950b1

services/core/java/com/android/server/wm/ConfigurationContainer.java

+3 −1
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
                task = task.getCreatedByOrganizerTask();

                if (task != null && (task.mOffsetYForInsets != 0 || task.mOffsetXForInsets != 0)) {

                    outAppBounds.offset(task.mOffsetXForInsets, task.mOffsetYForInsets);

                    outConfigBounds.offset(task.mOffsetXForInsets, task.mOffsetYForInsets);

                }

            }

            final DisplayPolicy.DecorInsets.Info decor =
@@ -284,11 +285,12 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
            if (!outConfigBounds.intersect(decor.mOverrideConfigFrame)) {

                if (inOutConfig.windowConfiguration.getWindowingMode()

                        == WINDOWING_MODE_MULTI_WINDOW) {

                    outAppBounds.inset(decor.mOverrideConfigInsets);

                    outConfigBounds.inset(decor.mOverrideConfigInsets);

                }

            }

            if (task != null && (task.mOffsetYForInsets != 0 || task.mOffsetXForInsets != 0)) {

                outAppBounds.offset(-task.mOffsetXForInsets, -task.mOffsetYForInsets);

                outConfigBounds.offset(-task.mOffsetXForInsets, -task.mOffsetYForInsets);

            }

        }

        float density = inOutConfig.densityDpi;