diff options
| author | 2023-03-06 08:20:27 +0000 | |
|---|---|---|
| committer | 2023-03-06 08:20:27 +0000 | |
| commit | be8a2737ee815d1b319114001bbcc6f670e98169 (patch) | |
| tree | 92e9321be7c3c790d2da06b0d67284ed87652f2f | |
| parent | f75442ff9455927461cc4be086286e44e5ddbb64 (diff) | |
| parent | 79ffe1cc6dc87f24b60f79686cef35e672de33ff (diff) | |
Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev am: 79ffe1cc6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21707652
Change-Id: Ib6e90027422a7fe3513cb98cd29babaeaeac1475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 9944f127521d..c8f9db7f7e34 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -8035,7 +8035,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } // Clear config override in #updateCompatDisplayInsets(). - onRequestedOverrideConfigurationChanged(EMPTY); + final int activityType = getActivityType(); + final Configuration overrideConfig = getRequestedOverrideConfiguration(); + overrideConfig.unset(); + // Keep the activity type which was set when attaching to a task to prevent leaving it + // undefined. + overrideConfig.windowConfiguration.setActivityType(activityType); + onRequestedOverrideConfigurationChanged(overrideConfig); } @Override |