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

Merge "Skip updating the leash if a task is removed prior to sync completion" into tm-qpr-dev

Browse Source
This commit is contained in:
Winson Chung
2023-02-23 22:25:00 +00:00
committed by Android (Google) Code Review
parent 7a0ec6a5cd 5502ffbfc2
commit e2574c8d1d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
View File

@@ -108,6 +108,10 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener {
} }
if (!createdWindowDecor) { if (!createdWindowDecor) {
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
if (!leash.isValid()) {
// Task vanished before sync completion
return;
}
// Reset several properties back to fullscreen (PiP, for example, leaves all these // Reset several properties back to fullscreen (PiP, for example, leaves all these
// properties in a bad state). // properties in a bad state).
t.setWindowCrop(leash, null); t.setWindowCrop(leash, null);
@@ -136,6 +140,10 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener {
final Point positionInParent = state.mTaskInfo.positionInParent; final Point positionInParent = state.mTaskInfo.positionInParent;
if (!oldPositionInParent.equals(state.mTaskInfo.positionInParent)) { if (!oldPositionInParent.equals(state.mTaskInfo.positionInParent)) {
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
if (!state.mLeash.isValid()) {
// Task vanished before sync completion
return;
}
t.setPosition(state.mLeash, positionInParent.x, positionInParent.y); t.setPosition(state.mLeash, positionInParent.x, positionInParent.y);
}); });
} }