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

Commit c1ed1f92 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778407

Change-Id: I3aaa74bb5262cae60c7646061714950d386f8b67
parents 6c0cb2fc caa65e4a

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);