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

Prevent cancel entering split due to animation got canceled

Browse Source 
There are chances the entering app transition got canceled by performing
rotation transition. This checks if there is any child task existed in
split screen before fallback to cancel entering flow.

Fix: 264734862
Test: atest WMShellUnitTests
Test: repro steps of the bug
Change-Id: I7647339514b22a03051b62772c01bcec440e2046
This commit is contained in:
Jerry Chang
2023-02-15 07:02:48 +00:00
parent d4768d6e08
commit 286d541fee
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -450,6 +450,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
break;
}
}
} else if (mSideStage.getChildCount() != 0) {
// There are chances the entering app transition got canceled by performing
// rotation transition. Checks if there is any child task existed in split
// screen before fallback to cancel entering flow.
openingToSide = true;
}
if (isEnteringSplit && !openingToSide) {
@@ -466,7 +471,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
}
}
if (!isEnteringSplit && openingToSide) {
if (!isEnteringSplit && apps != null) {
final WindowContainerTransaction evictWct = new WindowContainerTransaction();
prepareEvictNonOpeningChildTasks(position, apps, evictWct);
mSyncQueue.queue(evictWct);
@@ -545,6 +550,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
break;
}
}
} else if (mSideStage.getChildCount() != 0) {
// There are chances the entering app transition got canceled by performing
// rotation transition. Checks if there is any child task existed in split
// screen before fallback to cancel entering flow.
openingToSide = true;
}
if (isEnteringSplit && !openingToSide) {
@@ -571,7 +581,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
}
if (!isEnteringSplit && openingToSide) {
if (!isEnteringSplit && apps != null) {
final WindowContainerTransaction evictWct = new WindowContainerTransaction();
prepareEvictNonOpeningChildTasks(position, apps, evictWct);
mSyncQueue.queue(evictWct);