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

Merge "Clean up stale fixed rotation state" into udc-qpr-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-07-20 12:38:06 +00:00
committed by Android (Google) Code Review
parent 45300425b7 e1fd49b550
commit 706c4bcfe1
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2751,6 +2751,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
void onAppTransitionDone() {
super.onAppTransitionDone();
mWmService.mWindowsChanged = true;
onTransitionFinished();
}
void onTransitionFinished() {
// If the transition finished callback cannot match the token for some reason, make sure the
// rotated state is cleared if it is already invisible.
if (mFixedRotationLaunchingApp != null && !mFixedRotationLaunchingApp.isVisibleRequested()

1
services/core/java/com/android/server/wm/Transition.java
View File

@@ -1328,6 +1328,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
if (asyncRotationController != null && containsChangeFor(dc, mTargets)) {
asyncRotationController.onTransitionFinished();
}
dc.onTransitionFinished();
if (hasParticipatedDisplay && dc.mDisplayRotationCompatPolicy != null) {
final ChangeInfo changeInfo = mChanges.get(dc);
if (changeInfo != null