Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3aaa74bb5262cae60c7646061714950d386f8b67
This commit is contained in:
TreeHugger Robot
2021-09-08 12:07:40 +00:00
committed by Automerger Merge Worker
parent 6c0cb2fcec caa65e4a70
commit c1ed1f92c0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -4066,6 +4066,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
final long origId = Binder.clearCallingIdentity(); final long origId = Binder.clearCallingIdentity();
try { try {
synchronized (mGlobalLock) { 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, updateConfigurationLocked(values, null, false, true, userId,
false /* deferResume */); false /* deferResume */);
} }

3
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -5728,7 +5728,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
final Configuration currOverrideConfig = getRequestedOverrideConfiguration(); final Configuration currOverrideConfig = getRequestedOverrideConfiguration();
final int currRotation = currOverrideConfig.windowConfiguration.getRotation(); final int currRotation = currOverrideConfig.windowConfiguration.getRotation();
final int overrideRotation = overrideConfiguration.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); applyRotationAndFinishFixedRotation(currRotation, overrideRotation);
} }
mCurrentOverrideConfigurationChanges = currOverrideConfig.diff(overrideConfiguration); mCurrentOverrideConfigurationChanges = currOverrideConfig.diff(overrideConfiguration);