Merge "Active container should contain non-finishing activity" into sc-v2-dev am: d0f8b5e99d am: 7f876cde41

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

Change-Id: I7bcda47a4e1f12d35985ef3e156adc14ead594bf
This commit is contained in:
Chris Li
2022-01-13 01:44:54 +00:00
committed by Automerger Merge Worker

View File

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