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

Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev am: 79ffe1cc6d am: be8a2737ee

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

Change-Id: I604feaaf480f0b91ce78d1f9a451e6c106e0a597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2023-03-07 19:12:03 +00:00
committed by Automerger Merge Worker
parent 727ddfa1f8 be8a2737ee
commit ce18dfc3e2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -8145,7 +8145,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