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

Commit caa65e4a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid applying window config from updating persistent config" into sc-v2-dev

parents 71089505 b4fdc0e4

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

+3 −0
Original line number Diff line number Diff line
@@ -4066,6 +4066,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                // Window configuration is unrelated to persistent configuration (e.g. font scale,

                // locale). Unset it to avoid affecting the current display configuration.

                values.windowConfiguration.setToDefaults();

                updateConfigurationLocked(values, null, false, true, userId,

                        false /* deferResume */);

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -5728,7 +5728,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        final Configuration currOverrideConfig = getRequestedOverrideConfiguration();

        final int currRotation = currOverrideConfig.windowConfiguration.getRotation();

        final int overrideRotation = overrideConfiguration.windowConfiguration.getRotation();

        if (currRotation != ROTATION_UNDEFINED && currRotation != overrideRotation) {

        if (currRotation != ROTATION_UNDEFINED && overrideRotation != ROTATION_UNDEFINED

                && currRotation != overrideRotation) {

            applyRotationAndFinishFixedRotation(currRotation, overrideRotation);

        }

        mCurrentOverrideConfigurationChanges = currOverrideConfig.diff(overrideConfiguration);