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

Merge "Active container should contain non-finishing activity" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Li
2022-01-13 01:09:44 +00:00
committed by Android (Google) Code Review
parent 8be6f0ccbe be242f4684
commit d0f8b5e99d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
View File

@@ -346,7 +346,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
TaskFragmentContainer getTopActiveContainer() { TaskFragmentContainer getTopActiveContainer() {
for (int i = mContainers.size() - 1; i >= 0; i--) { for (int i = mContainers.size() - 1; i >= 0; i--) {
TaskFragmentContainer container = mContainers.get(i); TaskFragmentContainer container = mContainers.get(i);
if (!container.isFinished()) { if (!container.isFinished() && container.getTopNonFinishingActivity() != null) {
return container; return container;
} }
} }